Merge branch 'master' of /Users/taoly/myfiles/dev/hcm_core with conflicts.
task
Merge branch 'master' of https://github.com/tjsums/hcm_core

Conflicts:
	application.py
	config/hcm_core.conf
Merge branch 'master' of https://github.com/tjsums/hcm_core

Conflicts:
	application.py
	config/hcm_core.conf
Merge branch 'master' of https://github.com/tjsums/hcm_core

Conflicts:
	application.py
	config/hcm_core.conf
Merge branch 'master' of https://github.com/tjsums/hcm_core

Conflicts:
	application.py
	config/hcm_core.conf