cleanup
merging upstream
differentiated slideshow code and shows
loads of css, uploader changes
fixed merge issues
Merge branch 'master' of https://github.com/loganwbrown/art_eventz
fixed merge issue