Updated db-configuration to allow deploy to heroku
Merge branch 'master' of github.com:CiberNorge/cibrary-2014-2