Merge branch 'bowen' into Bohan-Zheng
add comment for action.js
add comment for semester.js
add nothing
Merge branch 'rtong' into shuaiwang

Conflicts:
	app/models/StudyPlan.java
merge with tong
solve confict
Merge branch 'bowen' into Bohan-Zheng

Conflicts:
	public/javascripts/action.js
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	Database/sss V1.8.sql
	Database/sssV1_7.sql
	Database/sssV1_8.sql
add sssV1.8
add
Merge branch 'bowen' into shuaiwang
Merge branch 'bowen' into Bohan-Zheng

Conflicts:
	Database/sss V1.8.sql
	Database/sssV1_7.sql
	Database/sssV1_8.sql
Merge branch 'shuaiwang' into Bohan-Zheng
add comments
add comments & merge with boahn
Merge branch 'bowen' into rtong