json
Merge branch 'master' of https://github.com/BusinesscardExchager/Eric-Maikel

Conflicts:
	CardApp/bin/BusinessCardExchager.apk
	CardApp/bin/resources.ap_