mergepoging issue12+13 into master
issue12+13 UsersController alvast toevoegen aan master