sub comments are now being pull
Merge branch 'master' into steven
updating favourited comments on elasticsearch
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Merge branch 'Costa'
Sort by location was backwards. Fixed that.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
javadoc CreateCommentActivity
javadoc editCommentActivity
Added MapsViewActivityTests (currently pass)
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
javadoc AssortedListViewActivity
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Fixed errors in test cases
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Fixed most tests
javadoc MainListViewActivity
javadoc MapViewActivity
Refactored a few classes
Fixed merge conflicts