ああああ
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/android/support/v7/appcompat/R$anim.class
	bin/classes/android/support/v7/appcompat/R$attr.class
	bin/classes/android/support/v7/appcompat/R$bool.class
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$dimen.class
	bin/classes/android/support/v7/appcompat/R$drawable.class
	bin/classes/android/support/v7/appcompat/R$id.class
	bin/classes/android/support/v7/appcompat/R$integer.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/android/support/v7/appcompat/R$string.class
	bin/classes/android/support/v7/appcompat/R$style.class
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/android/support/v7/appcompat/R.class
	bin/classes/com/example/solitonradar/BuildConfig.class
	bin/classes/com/example/solitonradar/MacAddress.class
	bin/classes/com/example/solitonradar/PlayerData.class
	bin/classes/com/example/solitonradar/PlayersPosition.class
	bin/classes/com/example/solitonradar/R$anim.class
	bin/classes/com/example/solitonradar/R$attr.class
	bin/classes/com/example/solitonradar/R$bool.class
	bin/classes/com/example/solitonradar/R$color.class
	bin/classes/com/example/solitonradar/R$dimen.class
	bin/classes/com/example/solitonradar/R.class
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$integer.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/com/google/android/gms/R$style.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/classes/com/google/android/gms/R.class