fixes
Merge branch 'master' of https://github.com/Grapheme/splat_innova_promises

Conflicts:
	public/theme/images/main_slider/slider-1.jpg
	public/theme/images/main_slider/slider-3.jpg
	public/theme/images/main_slider/slider-4.jpg
	public/theme/images/main_slider/slider-5.jpg