3: made compatible with phpstorm and potentially other non java intellij IDEs
Merge branch 'master' into develop
3: updated release notes
Merge branch 'release_1.2'