big commit
merge
gitignore
Merge branch 'master' of https://github.com/yastij/ResXY

Conflicts:
	src/view/StringManager.java
ptites modifs