More location testing
Cleaned up LocationController getters/setters as per feedback
Slight changed to LocationModel
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project