Merge branch 'master' of https://github.com/s-razaq/RaplaAndroidClient

Conflicts:
	README.md
Merge branch 'master' of https://github.com/s-razaq/RaplaAndroidClient

Conflicts:
	README.md