- added licence
Merge branch 'master' into develop
3: made compatible with phpstorm and potentially other non java intellij IDEs