Added keys
Fixed bug in keys.
Merge branch 'test' into dev
Added db update.
Merge branch 'test' into dev