Merge branch 'master' of github.com:guardianproject/InformaCam
stubs for google drive transport
handlers for out-of-activity authentication for google drive.  UNTESTED but will test before merging to master.
Merge branch 'master' of github.com:guardianproject/InformaCam into harlo_task_2290
removing extra drive cruft, adding in some stuff mikael included.
Merge branch 'master' of github.com:guardianproject/InformaCam

Conflicts:
	src/org/witness/informacam/transport/GlobaleaksTransport.java
Merge branch 'master' of github.com:guardianproject/InformaCam
Merge branch 'master' of github.com:guardianproject/InformaCam
Merge branch 'master' of github.com:guardianproject/InformaCam into harlo_task_2290
stubbing out google drive transport
merging..
clean up
merge problem fixed
now it works, but still have to handle initial oauth better...
minor fix to public credential upload
fixes to shareHash, and moved into core rather than the app
Merge pull request #35 from guardianproject/harlo_bug_2746

Harlo bug 2746