Add controllers for MathAssignment

Add controller for Section, Subsection, Complexity, MathAssignment with
views for editing these tables (available only for admin)
Conflict resolve

Conflict resolve
Merge remote-tracking branch 'origin/master'