Updates per dev efforts.
Merge branch 'master' of https://github.com/idevcoop/ctp-conf-dev

Conflicts:
	archive/lentil/d1/delta/FileExporter_delta_mgo_BR.json
	archive/lentil/d1/delta/FileExporter_delta_mgo_CA.json
	archive/lentil/d1/delta/FileExporter_delta_mgo_JP.json
	archive/lentil/d1/delta/FileExporter_delta_mgo_NZ.json
	archive/lentil/d1/snapshot/FileExporter_snapshot_mgo_BR.json
	archive/lentil/d1/snapshot/FileExporter_snapshot_mgo_CA.json
	archive/lentil/d1/snapshot/FileExporter_snapshot_mgo_JP.json
	archive/lentil/d1/snapshot/FileExporter_snapshot_mgo_NZ.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_ES.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_FR.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_GB.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_IE.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_IT.json
	archive/lentil/d2/snapshot/FileExporter_snapshot_mgo_ZA.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_AT.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_AU.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_CZ.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_DE.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_IL.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_KE.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_MX.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_NL.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_PL.json
	archive/lentil/d3/snapshot/FileExporter_snapshot_mgo_SE.json
	archive/lentil/snapshot/FileExporter_snapshot_mgo_DE.json
	connections/BasicConnections.json
	json/ProcessObjectFileAppender.json
	startup/Start_Coop_LentilExports_D1.json