Finally patched bugs and fixed build.gradle. ready for release.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	build.gradle
those are not needed anymore
Merge branch 'dev'