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

Conflicts:
	Team10ProjectW2014/project.properties
Merge branch 'master' into bradley
Merge branch 'master' into bradley
Added the Edit username dialog box to SCVA. Working on Tests for showing Sub Comments.
Merge branch 'master' into steven
Merge branch 'Costa'
Commit
Merge branch 'bradley'

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/CreateCommentActivity.java
Took lat and long from LocationListenerController due to redundancy
Fixed errors in MainListViewActivity and MainListViewActivityAdapter regarding change from HeadModel to CommentModel