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
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common code
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common code
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common code
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common code
Updated manager with calls to persister download REST APIs
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common code
minor changes to aidr-persister for JSON download format
Display the correct noun: "tweet" or "sms" depending on the collection type
Merge remote-tracking branch 'origin/master'
add public functions
Merge remote-tracking branch 'origin/master'
system.properties reset
generic system.properties
Delete .gitignore
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common
deprecated ErrorLog and LoadShedder; replaced all usage in module with aidr-common