merging database with master
merging app with master.
Integrate user signin.