Merge branch 'master' of /Users/Sammi/Documents/DEV/hcm_core with conflicts.
Merge remote-tracking branch 'origin/master'
Sammi 2014 11 08
Sammi 2014 11 08