ff
Merge branch 'master' of https://github.com/xfzxqingdao2014/QingDao_xfzx

Conflicts:
	new.txt