IntelliJ project files
Merge remote-tracking branch 'refs/remotes/origin/develop' into topic/maven