Moving to gradle 1+
Fixing various bugs: JSON handling, etc.
fix
Merge branch 'master' into develop
Merge branch 'release/bugfix'