Merge origin/master

Conflicts:
	public/sirstaffalot.html
Merge origin/master