Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/user/users_list.html