working on elasticsearch.
Elasticsearch able to retrieve id.
Added a new attribute of comment which is a comment property that will point to the topic level parent of a child comment and will be used in updating elasticsearch correctly.
Changed some comment code.
Finshed implementing saving replies using an elasticsearch id and updating by propagating up towards a comment that is topic level and updating it.
Fixing adding replies to elasticsearch.
Fixed the implementation to update elastic search with the comment replies. Now need to fix elastic search query.
Added back some code that was deleted on last commit.
Fixed the replying so no crashes in the app but elastic search saving reply still needs fixing.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/classes/cs/ualberta/ca/tunein/CommentController.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$ViewHolder.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity$1.class
	bin/resources.ap_
Finaly figureout how to do android testing
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes/cs/ualberta/ca/tunein/Comment.class
	bin/classes/cs/ualberta/ca/tunein/CommentPageActivity.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter.class
	bin/classes/cs/ualberta/ca/tunein/ReplyViewAdapter$ViewHolder.class
	bin/classes/cs/ualberta/ca/tunein/ReplyViewAdapter.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity$1.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity.class
	bin/resources.ap_
Finally got elasticsearch working with the replies. Now need to fix edit.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
Made an edit to the UML chart
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Added a few relations in the UML
Fixed the edit so it now works properly.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Refactored the user code so that it now uses simpiler shared preferences and also updated the user controller to work better.
Replaced the unique user id and testing now.