Cleaning up some resources, adding gradle build, possibly fixing a couple of things
Fixing a merge issue