Merge branch 'master' of https://github.com/MakChunMan/v81.git

Conflicts:
	V81/js/app.js
	V81/zh/page_ready_login.php
Merge remote-tracking branch 'origin/master'