More Checkstyle fixes

While rebasing I accidentally reverted checkstyle for the demo app.
This commit enables that again, fixing more style violations along the way (including XML files, most of which were ignored in my previous pull)