Details in authentication and others minor stuff
Merging user changes
Remove db yml conflict