Added gradle.properties to resolve #8
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	gradle.properties