Made the superdesk database config overide the security db config
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel