nothing really
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/release/res/values/google_maps_api.xml