FacultyController modified.
Merge origin/master