Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev