unknown sqlite3.db modification
changed james password on master end
master ios json login
Merge branch 'Eddie'
Merge branch 'master' of https://github.com/FireStop/WebV1 into Eddie