Renamed to aidr-task-manager-1.0.jar
Merge branch 'master' of https://github.com/qcri-social/AIDR
removed sevelet
Merge branch 'master' of https://github.com/qcri-social/AIDR
Release code version: output, trainer, tagger, task-manager
added logic on datasource restFUL update/insert & active deployment source for mobile apps
Merge remote-tracking branch 'origin/master'
added new table db script
aidr-manager: 73281038 Upon successful trash, user should be redirected to the "My Collections"
aidr-manager: 72869298 Add a "This may take several minutes" message
Merge remote-tracking branch 'origin/master'

Conflicts:
	aidr-output/src/main/java/qa/qcri/aidr/output/filter/JsonQueryList.java
re-structure to use public package for interactive view download
added more exception handling in collector
SPACING
Merge remote-tracking branch 'origin/master'
json download support - persister, manager; output code clean-up
public
deactivation of over 7days inactive clientApp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'