IntelliJ IDEA project changes
Merge branch 'master' into monster-classes