Poor
Merge branch 'master' of https://github.com/GrupoHardtech/BMS

Conflicts:
	admin/protected/config/parameters.php