Fixed some bugs in testpage
Fixed bug with adding event
getting ready for merge
Merge branch 'master' into gustav
made tests clear database when finished