从excel中读取company信息，并更新station信息4@home 2014-3-17 晚上
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/workspace.xml