removed controllers.
Re-added sort by location test which was removed during MVC merge
fixed annoying user preferences mistake
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole