Started working on local saves
Merge branch 'main_refactoring' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into main_refactoring

Conflicts:
	RefactoredProject/RefactoredProject/res/layout/favourites_view.xml
	RefactoredProject/RefactoredProject/src/cmput301w14t13/project/models/ServerProxy.java
Merge branch 'main_refactoring' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into main_refactoring

Conflicts:
	RefactoredProject/RefactoredProject/src/cmput301w14t13/project/controllers/MapViewController.java
Merge branch 'main_refactoring' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into main_refactoring