Merge origin/master

Conflicts:
	web/admin/ClockManager.jsp