collector, persister using aidr-common; manager fix for reported human labeled count
In DocumentType "twitter" correction
Merge branch 'master' of https://github.com/qcri-social/AIDR

Conflicts:
	aidr-collector/src/main/java/qa/qcri/aidr/collector/api/SMSCollectorAPI.java
Merging remote branch onto local branch