Competencias
Merge branch 'master' of https://github.com/fjmoran/HM

Conflicts:
	protected/views/users/_form.php