added ziyu
removed some debugging
Merge branch 'master' into eventlist
now lists event on front page