classpath changed to a x32 version of java
Merge branch 'master' of https://github.com/MindstormsNXJ/mindstorms.git

Conflicts:
	MindStorm/.gitignore
	MindStormSim/bin/.gitignore
	
not quite sure what exactly the conflicts where, hopefully I will not
break the repo