Add order for users and badges
Commented filters
Merge branch 'master' into feature/filters_for_columns

Conflicts:
	Gemfile.lock
	app/views/shared/_user.html.haml
Update schema
Merge pull request #60 from crowdint/feature/filters_for_columns

Feature/filters for columns