Merge branch 'master' into hendrik
Merge branch 'hendrik'
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing