Merge origin/master

Conflicts:
	web/admin.jsp
	web/admin_ok.jsp
	web/index.html
Merge origin/master