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
Merge branch 'secureshare' of https://github.com/guardianproject/storymaker into secureshare
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
Merge remote-tracking branch 'upstream/secureshare' into secureshare