Updated view

Footer is pushed to the bottom of the page
Catalogue set as the main "items" page (redirected for login)
Removed outdated search pages
Minor modifcations
Merge branch 'filter-search-expr' of https://github.com/adairdavid/SENG403G1 into filter-search-expr

Conflicts:
	app/views/catalogue/index.html.erb
Modified fail search page
Added view for search, filter, and sort in user

Only partial implementation of the logic is included for the filtering
and sorting
Refactoring sidebar, sort, filter helper_methods

To reduce re-useable code, these helper_methods are moved to
application_controller.rb
Fixed view for the sidebar

I had to use the "Faux Columns" method so unfortunately I had to add in
an image =(
Also removed a login button that wasn't being used
Merge remote-tracking branch 'origin/master' into filter-search-master-expr

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb
Final modifications
Merge branch 'filter-search-expr' of https://github.com/adairdavid/SENG403G1 into filter-search-expr
Modifications on search for users
Modifications on the search for items
User search done
Updated the catalogue view

Show tables for each item instead of for all items
Filtering/search/sorting options are shown and can be removed
Forces only one filtering option to be applied at one time
Displays 0 results message instead of error
Final search engine for users and catalogue
Merge branch 'filter-search-expr' of https://github.com/adairdavid/SENG403G1 into filter-search-expr
Minor tweaks and resolved minor issues with search
Minor tweak on user id search
Revised search, kinda figured out what went wrong with displaying the results