add some code
Merge branch 'master' of https://github.com/guchen0322/Sis

Conflicts:
	project.properties