carousel
add prototipe shop
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular-app/directives/carousel.js
	app/views/page/index.slim
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular-app/directives/carousel.js
	app/views/page/index.slim