bugfix db errors
android lib
Merge branch 'tcuje' into dev
merge from tcuje