Initial directory structure
Add idea support to project
Merge branch 'master' into develop