Dev into master

Added gradle.properties