small changes
gitMerge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Changed comment model classes to use SubCommentModels instead of Comment Models.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
changed SubCommentModel to accept CommentModel on constructor.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Casted model in CC attemptCommentCreation to SubCommentModel
added GSON
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Added GSON
Fix format of UserModel
Refactor username to userName
Update UML models
Started work on location provider
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' into steven