change db password
Merge remote-tracking branch 'origin/bowen' into ChenyangBai
bcy
fix conflict
Merge remote-tracking branch 'origin/ChenyangBai' into bowen
version1.3
version1.4
add authentication for admin side
update database
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
Merge branch 'bowen' into rtong