Updated models in Android, updated server

nothing tested yet