Merge branch 'release/1.4' into develop
Upgraded to Intellij IDEA 12.1
Merge branch 'release/1.5'