commit
Merge remote-tracking branch 'origin/Chris' into Robert

Conflicts:
	Amazon.PAAPI.WCF/bin/x86/Debug/Amazon.PAAPI.WCF.pdb
	WeListenPlayer.sln
	WeListenPlayer.v12.suo