added page for carousel
Merge branch 'carouselSearchModal'

Conflicts:
	public/client/appControllers.js