Initial work on Android Client support

Minor fix in SQL (upgrade script)