All categories + color fix
Merge branch 'master' of https://github.com/Firefoxiii/DPBsoft

Conflicts:
	app/bin/R.txt
	app/bin/app.apk
	app/bin/classes.dex
	app/bin/classes/com/dpbsoft/app/CharityWNFMainActivity.class
	app/bin/classes/com/dpbsoft/app/ListCategoriesActivity.class
	app/bin/classes/com/dpbsoft/app/ListCharitiesActivity.class
	app/bin/classes/com/dpbsoft/app/LoginActivity.class
	app/bin/classes/com/dpbsoft/app/MainActivity.class
	app/bin/classes/com/dpbsoft/app/R$color.class
	app/bin/classes/com/dpbsoft/app/R$id.class
	app/bin/classes/com/dpbsoft/app/R$layout.class
	app/bin/classes/com/dpbsoft/app/R$menu.class
	app/bin/classes/com/dpbsoft/app/R$string.class
	app/bin/classes/com/dpbsoft/app/R$style.class
	app/bin/classes/com/dpbsoft/app/R$styleable.class
	app/bin/classes/com/dpbsoft/app/SplashActivity.class
	app/bin/classes/com/facebook/android/R$layout.class
	app/bin/resources.ap_
	app/gen/com/dpbsoft/app/R.java
	app/gen/com/facebook/android/R.java
	app/res/layout/activity_category_dieren.xml
	app/res/layout/activity_charity_wnfmain.xml
	app/res/layout/activity_list_categories.xml
	app/res/layout/activity_list_charities.xml
	app/res/layout/activity_splash_screen.xml
	app/res/values/colors.xml