Merge origin/master

Conflicts:
	public/admin.html
	public/index.html