update databse (not tested)
Merge remote-tracking branch 'origin/master'

Conflicts:
	kanjee/assets/kanjee.sqlt