asd
Merge branch 'master' of https://github.com/andraskloczl/android

Conflicts:
	BaseGameUtils/bin/basegameutils.jar
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/BuildConfig.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/DatabaseManager.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/DbContMainActivity.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$attr.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$dimen.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$drawable.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$id.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$layout.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$menu.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$string.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R$style.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/R.class
	DatabaseExampleII/bin/classes/com/example/databaseexamplewithcontentprov/User.class
	SpaceshipBattle/bin/classes/com/andraskloczl/spaceshipbattle/R$layout.class
	SpaceshipBattle/bin/classes/com/andraskloczl/spaceshipbattle/R$menu.class
	SpaceshipBattle/bin/classes/com/andraskloczl/spaceshipbattle/R$string.class
	SpaceshipBattle/bin/classes/com/andraskloczl/spaceshipbattle/R$style.class
	SpaceshipBattle/bin/classes/com/andraskloczl/spaceshipbattle/R$styleable.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/BuildConfig.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$anim.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$attr.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$bool.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$color.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$dimen.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$drawable.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$id.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$integer.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$layout.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$string.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$style.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$styleable.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R.class
	google-play-services_lib/bin/google-play-services_lib.jar