Feature/database

merge Boilerplate with Database branches