Changes to elastic search.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Implemented part of elasticsearch for adding topic list.
Added code to get elastic search id.
Added test for editText
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
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/CommentViewAdapter$1.class
	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
	bin/classes/cs/ualberta/ca/tunein/ThreadController.class
	bin/classes/cs/ualberta/ca/tunein/ThreadControllerInterface.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity$1.class
	bin/classes/cs/ualberta/ca/tunein/TopicListActivity.class
Implemented Main menu button to go back to title screen.
Added Edit Page XML. Fixed some confusion of the main page with favorites in the middle of sorts, suggesting sorting by favorites. Added shortcut buttons to main page and spaced it out a little.
Added Edit Page Activity class.
Finished implementation of edit reply. Need to implement image and geolocation for edit.
Fixing up edit comments and added Junit test for EditPageActivity.
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.
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