updated aidr-output for temp proxy settings
Merge branch 'master' of https://github.com/qcri-social/AIDR
updated aidr-task-manager-1.0.jar for tagger-api