update
Merge branch 'master' of github.com:RuiqingQiu/CSSA

Conflicts:
	project.properties