modify db connection
Merge branch 'master' into coding
change password encryption
merge coding