commit fix bug on user
Merge branch 'develop' of https://github.com/hopitio/e-com.git into
develop

Conflicts:
	src/application/controllers/BaseController.php
Merge branch 'develop' of https://github.com/hopitio/e-com.git into develop