12.4

12.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/base.css
	index.htm
	js/init.js
	login.htm
	reg.htm
	reg2.htm
	reg3.htm
	user.htm
	userConf.htm