3_17 update
Merge quiz functionality.
fix formatting and lesson merge.
Integrate Quizzes
Display bookmark link if there isn't a bookmark.

Display bookmark link if there isn't a bookmark already. Redirect to
Lessons -> view instead of using Bookmarks -> view
fix merge
Update tests so they work
fix validation errors
fix Roster validation
Merge from Dawn's branch