DF Fixed some checkstyle problems.
Merge branch 'master' of github.com:qcadoo/qcadoo