fixed db methods, fixed activity html generator
resolve merge conflicts