Some fixes
Merge branch 'master' of https://github.com/dykan/APUIengine

Conflicts:
	src/examples/UniteStrings.java