Revoked the gradle build stuff for now. Continue the old way
Merge branch 'master' into back
Removed gradle from the project