re-idented code in instructor.server.controller
resolved conflict
resolved conflicts