App and user sorting

Conflicts:
	app/views/users/index.html.haml