random stuff @ bc 2013-05-28
Merge branch 'master' of github:leronen/leronen-java

Conflicts:
	leronen.jar
unspecified changes @ BC