Bunch of random classes and activities.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BingMerchantApp/AndroidManifest.xml
	BingMerchantApp/res/values/strings.xml