0922 new QRphone webpage
Merge branch 'ylc'

Conflicts:
	WebContent/login.html