UI fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	KET testai/src/main/res/layout/activity_test.xml
Database Update
Database Update