update models, managers
build fix
Merge remote-tracking branch 'origin/todo/dbmanager_scheme'

Conflicts:
	android/app/src/main/java/com/outcross/coffeehistory/fragment/MainType1Fragment.java