Finished View's ControlForm class, starder working on AcademicDiscipline.
Merge branch 'master' of github.com:blazern/Props