updated
db scripts for new default classifiers and for old default classifiers.
Merge remote-tracking branch 'origin/master'

Conflicts:
	aidr-manager/src/main/resources/system.properties
	aidr-manager/src/main/webapp/resources/js/aidrfm/collection-details/controller/CollectionDetailsController.js
	aidr-manager/src/main/webapp/resources/js/taggui/tagger-collection-details/controller/TaggerCollectionDetailsController.js
	aidr-trainer-api/src/main/java/qa/qcri/aidr/trainer/api/service/impl/DocumentServiceImpl.java
db scripts for classifiers insert & update
Merge remote-tracking branch 'origin/master'

Conflicts:
	aidr-manager/src/main/webapp/resources/js/aidrfm/collection-details/controller/CollectionDetailsController.js
	aidr-manager/src/main/webapp/resources/js/taggui/tagger-collection-details/controller/TaggerCollectionDetailsController.js
Updated manager code for public page; cut-down message logging in output; updated task-manager for trainer-api services
Merge remote-tracking branch 'origin/master'

Conflicts:
	aidr-manager/src/main/java/qa/qcri/aidr/manager/controller/PublicController.java
	aidr-manager/src/main/java/qa/qcri/aidr/manager/service/impl/TaggerServiceImpl.java
undo string replace operation in public controller and, enhance json data validator.
Trainer-api update with new entity
comment out all debug codes and new entity added
Merge remote-tracking branch 'upstream/master'