commit
Merge branch 'master' of https://github.com/shawnjust/CloudAddressBookAndroid

Conflicts:
	bin/CloudAddressBook.apk
	bin/classes.dex
Merge branch 'master' of https://github.com/shawnjust/CloudAddressBookAndroid
add client

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/shawnjust/CloudAddressBookAndroid