new change
Merge remote-tracking branch 'origin/master'

Conflicts:
	BingMerchantApp/src/com/example/bingmerchantapp/MainActivity.java