am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev

* commit '06e6b622b9f9c6501f4888704bb15154d7c0a703':
  Update IntelliJ project file for IntelliJ 14