Merge pull request #642 from nicolas-f/pr

Merge with irstv/master
Fix bat file
Merge pull request #648 from agouge/647

Fix bat file
Remove version in final jar orbisgis dist
Merge remote-tracking branch 'irstv/orbisgis-h2' into orbisgis-h2

Conflicts:
	orbisgis-dist/src/bin/zip/orbisgis.bat