update
update
Merge branch 'master' of https://github.com/g8231226702/mobile_final

Conflicts:

solutions-mobile-backend-starter-android-client-master/bin/CloudBackendA
ndroidClient.apk
	solutions-mobile-backend-starter-android-client-master/bin/classes.dex

solutions-mobile-backend-starter-android-client-master/bin/resources.ap_