Merge branch 'master' into dev

Conflicts:
	build/Paint.JAVA.jar
Merge pull request #1 from HeroesGrave/dev

reset dev