changes
Merge branch 'master' of https://github.com/satnambajwa85/zadovo

Conflicts:
	themes/home/css/style-inner.css
	themes/home/views/layouts/main.php