home & content manager update
Merge remote-tracking branch 'upstream/master'
checkstyle + some variables types
small fix
Merge pull request #365 from solispauwels/master

home & content manager update