new Database
database changes
Merge branch 'master' into product-show-screen

Conflicts:
	bin/classes.dex
	bin/classes/com/example/project01/StartUp.class
	bin/resources.ap_