Licence conflict resolved.

Conflicts:
	LICENSE
(fix) link to the class
initial commit
The web client ID was incorrect. I had put in the android app id by mistake.
doc notes
outer class
creating the create conference elements v1
Building the create conference elements
Wrote the onRestoreInstanceState method
Added the image selector from gallery
Upload picture button added
download activity create and code added to uploadimagebutton
Picture serve working
Adding changes to DownloadActivity.java to git