增强了校验
增加了测试类
Merge branch 'master' of https://github.com/heichong/QNFushishan.git

Conflicts:
	src/com/qunar/main/Test.java