fixing the connetionstring and the context
Merge branch 'database'