Fix typos
Upgrade for IntelliJ 14.0.2