project properties ignored
done
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA

Conflicts:
	project.properties