hello
 Please enter the commit message for your changes. Lines starting
fix
Merge remote-tracking branch 'origin/rtong' into bowen
fix
Merge branch 'bowen' into Bohan-Zheng

Conflicts:
	Database/sss V1.8.sql
	Database/sssV1_7.sql
	Database/sssV1_8.sql