demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/bin/classes.dex
	client/bin/resources.ap_
Merge branch 'master' of https://github.com/MinaVi/AndroidApp

Conflicts:
	client/bin/classes.dex
	client/bin/resources.ap_
Revert "Merge branch 'master' of https://github.com/MinaVi/AndroidApp"

This reverts commit e6a589d1f3d22c4269ff15776f9140c199e06149.