Upgraded Login to MySQLi
Merge branch 'master' into Android