Upgraded IntelliJ IDEA to 14.0.1
Merge pull request #7379 from joschi/master

Upgrade IntelliJ IDEA to 14.0.1