build ja test
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS/build/classes/.gitignore
Merge branch 'master' of https://github.com/lauralilleste/SoftEngine