Refactored a few classes
Fixed merge conflicts
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into refactoring
JavaDoc for MapsViewActivityListManager
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into refactoring
Refactored LocationListenerModel to have LocationListenerModelErrorHandler
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into steven