bugfixes,comments, translations,javadoc
Merge remote-tracking branch 'master/master' into master2