Added test file for SubCommentViewActivity
Merge branch 'master' into steven
changed API properties
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/project.properties
implemented the passing of the HeadModel to SubCommentViewActivity
Merge branch 'Cole'
minor changes
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
changed attemptCommentCreation from private to public
Tempcommit
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/project.properties
Worked on SubCommentViewActivity Tests
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/HeadModel.java
small changes
Main List View Adapter adds image to head comment in list
Merge branch 'master' into bradley
maded CommentModel Serializable. Worked on Test for SubCommentViewActivity.
Merge branch 'steven'
Fix NullPointerException Error in SubComment