favicon
Merge branch 'master' into dev
minified
not minified
message if user can't receive activation
fixes #12
fixes #9 back button
Merge branch 'dev'

Conflicts:
	client/index.html