Initial
Merge branch 'master' of https://github.com/app-z/magento-android-web-api

Conflicts:
	web-api.php