updated - using gradle build
Merge remote-tracking branch 'origin/master'

Conflicts:
	slbongrnddsgn/build.gradle