mergin
merge
updating the db
little merge

Merge branch 'master' of https://github.com/Opstrup/drone_backend