Merge pull request #25 from hopesfish/dev

Dev
Merge pull request #26 from hopesfish/dev

1 hospital -> company
Merge pull request #27 from hopesfish/dev

Dev
Merge pull request #25 from pengqin/dev

Dev