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

Conflicts:
	src/application/views/layout/one_colmun.php