adapter change
some more files for adapter.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BingMerchantApp/res/values/strings.xml