Merge branch 'master' into feature/user-management

Conflicts:
	client/style.css