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

Conflicts:
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2$1.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$3.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$4.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter.class
	src/cs/ualberta/ca/tunein/CommentViewAdapter.java
Refactored some topic list code.
Refactored more topic list code.
Commit commentviewadapter.
Merge branch 'master' of https://github.com/kchow3/Group-Project

Conflicts:
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2$1.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$3.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$4.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter.class
Refactoring code to use elasticsearch updates.
Chnaged the majority code of loading replies and used elastic search to load.
Fixing problems with reply level 1.
Fixed elastic search.
Fixing up loading replies from elasticsearch.
Refactored code in CommentPageActivity and elasticsearch getting works but updating the ui through thread doesn't work yet.
Fixed up some elastic search, it now refreshes but query is incorrect.
Fixed commentpage activity so it now displays level 1 replies correctly.
Fixed replies to replies showwing up and updating correctly on CommentPageActivity.
Fixing topic list refresh from elastic search.
Fixing Topic List View.
Fixed topic refreshing and fixed up elastic search
Tested and working.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_