Merge branch 'master' of /Users/tangrongjian/trjwork/hcm_core with conflicts.
Merge remote-tracking branch 'origin/master'
photo
modify application resource
revert
revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.py
revert
remove disable org
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.py
remove disable org
merge