changes on Customer Controller  and module for disabled action changes

changes on Customer Controller  and module for disabled action changes
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	app/Model/Department.php
Merge branch 'master' of https://github.com/BSSAM/bs