added menu option for upload manager
Merge branch 'secureshare' of https://github.com/guardianproject/storymaker into secureshare
Merge branch 'secureshare' of https://github.com/guardianproject/storymaker into secureshare
first commit of async render/upload framework ... needs refactoring before merging to guardian
Merge remote-tracking branch 'micah/secureshare' into secureshare

Conflicts:
	app/src/info/guardianproject/mrapp/AccountsActivity.java
make publish package objects take an activity instead of a context so we can use them with MPM; video render works
real rendering works now
Merge branch 'secureshare' of github.com:micahjlucas/mrapp into secureshare

Conflicts:
	app/src/info/guardianproject/mrapp/model/Auth.java
	external/SecureShareLib
Merge branch 'secureshare' of https://github.com/guardianproject/storymaker into secureshare
some cleanup in the media package
moving publish framework to depend on context not activity
move static methods out of the application object into the Utils class for clarity and to decouple dependance on Application object
moving publish framework to depend on context not activity
updated SecureShare peg to include new flickr and scribe .jar files
added line to project.properties that seems to be required to build with flickr/scribe libraries
rendering works on background thread in IntentService.  still need to hookup callbacks to show progress
render progress now makes it all the way back to the fragment from the service
Merge remote-tracking branch 'upstream/secureshare' into secureshare
Merge remote-tracking branch 'micah/secureshare' into secureshare
tweaded publish framework to wait til user hits uplaod before uploading.  added facebook uploading, it works!