Zurmo decoupled from model. Non token based access.
Merge branch 'regional' into zurmo_decoupling
Merge branch 'master' into develop

Conflicts:
	app/extractor/extractor.js
	config/dev.json
Mode condition fixed.