lalalololololo
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt

Conflicts:
	google-play-services_lib/bin/classes/android/UnusedStub.class
	google-play-services_lib/bin/classes/com/google/android/gms/BuildConfig.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$attr.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$color.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$drawable.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$id.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$integer.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$string.class
	google-play-services_lib/bin/classes/com/google/android/gms/R$styleable.class
	google-play-services_lib/bin/classes/com/google/android/gms/R.class