0910 block
Merge branch 'lowlow'
Merge branch 'lowlow'
Merge branch 'lowlow'
0916 update page if no cookie to log
0916 UI
0922 new QRphone webpage
Merge branch 'ylc'

Conflicts:
	WebContent/login.html
Merge branch 'master' of https://github.com/ylc1218/QRphone
0922 add js to new page(except for update page)