Tempcommit
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/project.properties
Merge branch 'master' into bradley
Created MainListViewActivityTests
Added pseudo code for head comment list sort test
Started display comment in list test for MainListViewActivityTests
Added id to sub_comment_view_head_comment_item. Added test for showing HeadComment in SCVA.
Worked on LocationListenerController
Merge branch 'master' into bradley
Add DataController Interface
Merge branch 'bradley'
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Update DataController Interface UML
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Costa
Merge branch 'master' into bradley
Merge branch 'master' into steven
Added Comment to testShowHeadComment
Merge branch 'steven'
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Costa