Pulling changes from upstream
merging with upstream
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	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/MainActivity.class
	bin/classes/cs/ualberta/ca/tunein/R$id.class
	bin/classes/cs/ualberta/ca/tunein/R$layout.class
	bin/classes/cs/ualberta/ca/tunein/R$menu.class
	bin/classes/cs/ualberta/ca/tunein/R$string.class
	bin/classes/cs/ualberta/ca/tunein/R$style.class
	bin/classes/cs/ualberta/ca/tunein/ReplyViewAdapter$ViewHolder.class
	bin/classes/cs/ualberta/ca/tunein/ReplyViewAdapter.class
	bin/classes/cs/ualberta/ca/tunein/ThreadController.class
	bin/classes/cs/ualberta/ca/tunein/ThreadControllerInterface.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity.class
	bin/resources.ap_
	gen/cs/ualberta/ca/tunein/R.java
Finished tests for CommentController class
updated test for Commenter class
Updated tests for Comment class
Updated tests for classes with only getters and setters
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_