settings aangepast en detail view
Merge branch 'master' of https://github.com/BusinesscardExchager/Eric-Maikel

Conflicts:
	CardApp/bin/BusinessCardExchager.apk
	CardApp/bin/classes.dex

CardApp/bin/classes/com/example/businesscardexchager/EditCardActivity.cl
ass
	CardApp/bin/classes/com/example/businesscardexchager/FragmentA.class
	CardApp/bin/classes/com/example/businesscardexchager/FragmentB.class
	CardApp/bin/classes/com/example/businesscardexchager/MainActivity.class

CardApp/bin/classes/com/example/businesscardexchager/MyGridAdapter.class
	CardApp/bin/classes/com/example/businesscardexchager/R$id.class
	CardApp/bin/classes/com/example/businesscardexchager/R$layout.class
	CardApp/bin/classes/com/example/businesscardexchager/R$menu.class
	CardApp/bin/classes/com/example/businesscardexchager/R$string.class

CardApp/bin/classes/com/example/businesscardexchager/SettingsActivity$1.
class

CardApp/bin/classes/com/example/businesscardexchager/SettingsActivity.cl
ass
	CardApp/bin/resources.ap_
	CardApp/gen/com/example/businesscardexchager/R.java
	CardApp/res/values/strings.xml