合并页面
添加httpClient包
Merge branch 'new051002' into dev

Conflicts:
	pom.xml
合并页面
Merge branch 'dev' of https://github.com/railproject/trainplan into dev