aidr-gis init. commit
aidr-gis init. commit
scheduler update on esri data output
Trainer pybossa pom update
updated manager: testing for ajax timeout change and persister modifications
handle file generation based on output update status
Merge remote-tracking branch 'origin/master'
updated with dataout of geojson
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
aidr-manager: 70640310 - Button for trashing a collection.
Revert not proper merge.
Merge remote-tracking branch 'origin/master'
Fixes compilation errors in java code.
Merge remote-tracking branch 'upstream/master'