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

Conflicts:
	app/project.properties
	app/res/drawable/b2.png