changed resource paths to also work in jar
Merge remote-tracking branch 'origin/master'