Implementing the buttons on the main page.
Finshed implementing the username and user id.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Testing out changes since yesterday
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
Added test framework for ElasticSearch classes
fixed formatting issue in commentControllerTest
Fixed the replys posting to elastic search and updating correctly in the app.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
Added an onCreate test for the CommentPageActivity class
Changed the geolocation code to get real gps cords.
Added toast message to username change and fixing geolocation.
Refactored TopicListActivity, ThreadController code.
Refactored CommentViewAdapter, CommentController code.
Refactored CommentPageActivity code.
Refactored ReplyViewAdapter code.
Refactored ReplyViewAdapter some more.
Refactored CommentViewAdapter and CommentPageActivity some more.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/TuneIn.apk
	bin/classes.dex
	bin/resources.ap_
Removed the unnecessary interfaces.