Setting up development database
merged conflicts