new config mechanism
Merge branch 'develop' of bitbucket.org:metasolutions/entryscape