Removed reply object from UML; object does not actually exist in code.
Relationship changes
Described relationships
Implementing the buttons on the main page.
Updated TuneIn related objects
Exported JPEG
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_
Changed the geolocation code to get real gps cords.