修改代码
Merge branch 'master' of https://github.com/Foboy/GoGoTown

Conflicts:
	trunk/crm/admin/scripts/client/client-ctrl.js
Merge branch 'master' of https://github.com/Foboy/GoGoTown
Merge branch 'master' of https://github.com/Foboy/GoGoTown
Merge branch 'master' of https://github.com/Foboy/GoGoTown
Merge branch 'master' of https://github.com/Foboy/GoGoTown
Merge branch 'master' of https://github.com/Foboy/GoGoTown
修改整理js
Merge branch 'master' of https://github.com/Foboy/GoGoTown

Conflicts:
	trunk/crm/admin/scripts/client/client-ctrl.js