change db password
Merge remote-tracking branch 'origin/bowen' into ChenyangBai
bcy
fix conflict
Merge remote-tracking branch 'origin/ChenyangBai' into bowen
Merge branch 'Bohan-Zheng' into rtong
Merge branch 'Bohan-Zheng' into rtong
version1.4
add authentication for admin side
update database
version1.5
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
wawawawawawa
Merge branch 'bowen' into rtong
cascading deletion
Merge branch 'rtong' into Bohan-Zheng
done with semesterData
Merge branch 'rtong' into Bohan-Zheng
version2.0
Merge branch 'shuaiwang' into Bohan-Zheng

Conflicts:
	app/models/StudyPlan.java