Fixed catalogue view

Catalogue reverted back to table form
Fixed filtering

Removes current page number for new filtering results
Added filtering and ordering in user view
Merge branch 'master' into user-filter-master

Conflicts:
	app/controllers/users_controller.rb