"Common configuration" task is finished
"Common configuration" task is finished
Merge branch 'master' of github.com:qcri-social/AIDR

Conflicts:
	aidr-tagger-api/src/main/java/qa/qcri/aidr/predictui/api/CrisisResource.java
Merge branch 'master' of github.com:qcri-social/AIDR

Conflicts:
	aidr-tagger-api/src/main/java/qa/qcri/aidr/predictui/api/CrisisResource.java