removing db from master
updating waterline
branch changes