Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/sg/free/wbslist.jsp
#	src/main/webapp/webpage/modules/sg/project/manageList.jsp