Added commented out test for future elastic search testing in MainListViewActivityTests
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Costa

Conflicts:
	Team10ProjectW2014/bin/Team10ProjectW2014.apk
Fixed issue with testing sort by location in MainListViewActivity
Fixed bug with restoring actual list for sort by location test in MainListViewActivity
Refactored xml layout file names
Added CommentContentEditing interface for CC and EC
Added CommentContentEditing interface file for CC and EC
Added javaDoc to CommentContentEditing interface
Changed UML to reflect CC and EC a little better
Fixed UML and final changes to code organization
idk
merged master