user welcome
Merge branch 'master' of https://github.com/diegopuglia/cdm

Conflicts:
	frontend/application/controllers/UserController.php