details
Merge branch 'develop' of https://github.com/hopitio/e-com into develop

Conflicts:
	src/application/views/home.php
	src/application/views/layout/one_colmun.php
	src/docroot/style/home.css
	src/docroot/style/main.css