Merge branch 'rtong'
Merge branch 'rtong'
Merge branch 'master' into rtong
Merge branch 'bowen' into rtong
Merge branch 'bowen' into rtong
database1.8
Merge branch 'bowen' into rtong
Merge branch 'rtong' into Bohan-Zheng

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