Updates
Merge branch 'master' of https://github.com/payu-intrepos/Android-SDK

Conflicts:
	.gitignore
Bump version