2st

add members view and class view
attempt to merge master with buck and Hao
adding changes by robert
push stuff from 25th