added comment how to get resourcebundle to work (specify class path!)
Merge remote-tracking branch 'origin/master'