update
Merge branch 'master' of https://github.com/shazichuanhuo/heat_final_version

Conflicts:
	heat_final_version/docs/permissionmapping.xls