zmiany carousel
Merge origin/master

Conflicts:
	application/views/scripts/index/index.phtml