Sorting routes
Cleaning code
Merge branch 'master' into t12121-tag-categories

Conflicts:
	config/routes.rb