added crop icon,
refactored the way controls load in slideshow modals
Merge branch 'master' of https://github.com/punkave/apostrophe