displayed minutes in time
Merge branch 'master' into steven
Working on reply to the correct comment
Merge branch 'master' into steven
Messed aroun with location comparator
 d
Added EditComment to the XML
Merge branch 'bradley'
made edit comment work with head comment
working on sorting by date
Add bad activity test
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 Cole
nsafda
added file.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/SubCommentViewActivity.java
Merge with master
Fixed testDisplayCommentInList in MainListViewActivtyTests
Added backup and restore original comment list during testDisplayCommentInList in MainListViewActivityTests