X
Merge branch 'master' of https://github.com/GrupoHardtech/BMS
Mobile and more
Merge branch 'master' of https://github.com/GrupoHardtech/BMS

Conflicts:
	admin/protected/config/parameters.php
	admin/protected/models/views/MerchandiseView.php