Reformatting model file
Adding more info to calendar event popup
Moved user name rendering functions into Model.User, should probably be View.User
Fixed rendering of end date in calendar event popup
Added login/out to nav bar
colspan goes on td, not tr