Merge commit '2c91cc63d0e28a4f202ee2db9a8d769e63d54f7f'

diff --cc clickslide/cgilite/file.sh
Simple merge

diff --cc clickslide/cgilite/session.sh
Simple merge

diff --cc clickslide/cgilite/storage.sh
Simple merge

diff --cc clickslide/clickslide.css
Simple merge

diff --cc clickslide/clickslide.sh
Simple merge

diff --cc clickslide/demo/Makefile
index 0000000000000000000000000000000000000000,7cb408005961b96e541a1d423d5634248acd2def..7cb408005961b96e541a1d423d5634248acd2def
mode 000000,100644..100644
--- /dev/null
--- 2/demo/Makefile
+++ b/clickslide/demo/Makefile

diff --cc clickslide/demo/demo.short
index 0000000000000000000000000000000000000000,9b239f6a33f484a1971071cacd28c5b2893c41e5..9b239f6a33f484a1971071cacd28c5b2893c41e5
mode 000000,100644..100644
--- /dev/null
--- 2/demo/demo.short
+++ b/clickslide/demo/demo.short

diff --cc clickslide/demo/exb0.jpg
index 7aa9056798df3605132f795ad9e914ec47feda65,7aa9056798df3605132f795ad9e914ec47feda65..7aa9056798df3605132f795ad9e914ec47feda65
Binary files differ

diff --cc clickslide/demo/exb1.jpg
index cec55200f22c56937ec09e07088bfef77f82614f,cec55200f22c56937ec09e07088bfef77f82614f..cec55200f22c56937ec09e07088bfef77f82614f
Binary files differ

diff --cc clickslide/demo/exb2.jpg
index 70710dc6b597f23adc3e7d642f009869c91dccec,70710dc6b597f23adc3e7d642f009869c91dccec..70710dc6b597f23adc3e7d642f009869c91dccec
Binary files differ

diff --cc clickslide/demo/exb3.jpg
index c6832f03544e60c9566ad7548c3df130b60d5cb6,c6832f03544e60c9566ad7548c3df130b60d5cb6..c6832f03544e60c9566ad7548c3df130b60d5cb6
Binary files differ