Made a minor edit to the UML chart
Merge pull request #1 from CMPUT301W14T3/master

Pull for most recent commit
Made changes to UML chart; User needs an association
Added the gson jar files to libs folder and configured the build path.
Renamed Thread Class to ThreadList since java already has a class named Thread which is used in the elastic search.
Added changes to elastic search, now need to test if it works.
Changed threadTest to threadListTest
Added code to elastic search.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Testing ElasticSearch
Changes to elastic search.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Made testcase for Comment class. Not complete yet.
Tried for a push
Fixed Comment class testcase
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/AndroidManifest.xml
	gen/cs/ualberta/ca/tunein/R.java
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Added camera permissions to the manifest
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Changed MainActivity XML layout