Merging the database branch with UrbApp