fixed merge conflicts, added questionlist, added date, fixed strings nl + en