Merge branch 'release/1.6.0' into develop
Added ignores for intellij files
Added Groovy @Log annotation and bumped to 1.7.0
Merge branch 'release/1.7.0'