Update Checkstyle rules
Merge branch 'skeleton'
Fix code inspection problems
Merge branch 'develop'