Working in the IntelliJ IDEA project layout.
Deleted local *.iws file.
Updated .gitignore.
Fixed some issues with source code using java 7 features.
Working intellij project (ipr file based).