push request 22
Merge origin/master

Conflicts:
	Amazon API/AmazonAPI/Example.php