NeuralISScilab
Merge branch 'master' of https://github.com/kilel/gintshell.git

Conflicts:
	java/.classpath
	java/bin/org/kilar/hybridIS/general/Project.class
Merge branch 'master' of https://github.com/kilel/gintshell.git