chatbox, databasecontrols / tests

all tests done
Merge remote-tracking branch 'origin/master'