beautiful billen

jawel
Merge branch 'master' of https://github.com/jeuris/steiner_dev
Migrations edited to new db config
Merge branch 'master' of https://github.com/jeuris/steiner_dev