Updated project to run with Intellij 14