Merging submodules
Updating android-client
Updating android client
Updating android submodules