commit 2.0
Merge branch 'master' of https://github.com/Marmota84/JavaSource

Conflicts:
	JavaBridge/WebContent/readme.txt
commit 1.5
Merge branch 'master' 2