zmiany w user list
zmiany w user list
Merge remote-tracking branch 'origin/new-header-layout' into new-header-layout

Conflicts:
	app/assets/javascripts/discourse/controllers/header_controller.js