Issue #4 copy database to runtime android dir
fix merge conflicts