MAJ properties
MAJ properties
Merge branch 'master' of https://github.com/siwon/PolyStunter.git

Conflicts:
	PolyStunter/build/classes/properties/text_en.properties