Added favourites activity and linked it to the action bar
Merge branch 'master' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger
Started work on saving favourites.
Major refactor; Test package may be broken
Merge branch 'server_refactor' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into server_refactor

Conflicts:
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentloggertests/mockups/DataEntityMockup.java
Fix Elastioc Search: concurrency issues!!!
Topics display
comments
Fixed bug where GPS location was being set to null. Default to 0,0 if GPS coords cannot be fetched by phone.
Wrote set favourites test
Merge with server_refactor
Continued work on favourites activity
Minor fix to deserializer
Some server fixes; working on casting
Comments and Topics save properly. Fixed bugs with the equals method in Topic and Comment
Merge branch 'server_refactor' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into favourites
Bug fixing
Merge with master
Topics and comments can be saved and loaded. Associated tests have been written
merge
Merge branch 'master' into NavjeetsBranch

Conflicts:
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/CreateSubmissionActivity.java