Database fix
Merge branch 'Klopsch'
features
Merge branch 'master', remote-tracking branch 'origin' into lacoste