Merge origin/master

Conflicts:
	www/partials/login.html