Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users.html
resolve conflicts again