Merge branch 'master' of https://github.com/danrodriguezguerrero/huawei

Conflicts:
	application/modules/core/views/layout.php
Merge branch 'master' of https://github.com/danrodriguezguerrero/huawei