Database Merge

Modified DBContext and Connection string