made constants unexported to satisfy lint

incorrect order of arguments in fnd query

use explicit base tag instead of :latest

fix for tinode#378

Merge branch 'devel'

Merge branch 'devel'

better error text

(cherry picked from commit a57701b)

bump database version and provide db upgrade logic

update android screenshots

fix for maxresults being reset on adapter.Open()