test confilct ylc
Merge branch 'ylc'
Merge branch 'master' of https://github.com/ylc1218/QRphone

Conflicts:
	WebContent/WEB-INF/web.xml