carousel addition
adding carousel
Merge remote-tracking branch 'origin/master'

Conflicts:
	moviesearch.py
	static/js/ms_controller.js
	utils.pyc