Mer design
Merge branch 'master' of https://github.com/matst80/samak

Conflicts:
	public/loggedin.htm
test
Merge branch 'master' of https://github.com/matst80/samak