cleanup
merging upstream
differentiated slideshow code and shows
loads of css, uploader changes
Merge pull request #35 from cenderin/master

search added
fixed merge issues
Merge branch 'master' of https://github.com/loganwbrown/art_eventz