Niko's Last update
Merge branch 'master' of https://github.com/Kambocha/Ziko

Conflicts:
	Cars.html
	Home.html
	Location.html
	css/additionalstyles.css
	css/bootstrap.css
	css/bootstrap.min.css
	themes/1/js-image-slider.css