Added Sign-in; need to block pages if not signed in
fixed merge conf in db schema