commit
Merge branch 'develop' of github.com:fabianrios/arteccb into develop

Conflicts:
	controller/user.controller.php