Spalte in der DB umbenannt: userName => name
Merge branch 'master' into playground