Merge remote-tracking branch 'upstream/master'
Commit 3.3

-fixed mate
Merge remote-tracking branch 'koen/master'
slider now working
Merge remote-tracking branch 'koen/master'
fixed mating
M
Merge remote-tracking branch 'josef/master'
more behaviour fix and cell change