404 страница и Слайдер
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/webroot/js/scripts.js