App and user sorting
Merge branch 'apps_and_users_ordering' into netbrick

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.haml