Merge remote-tracking branch 'origin/master' into features/bot
Nieuwe bot features
merged with bot branch