Revert "Moved to 2.x branch of Features module."

This reverts commit b74687ee79de4f22ec32a3cb7e7b723caf0068ea.
Revert "Fixed issue where super faculty couldn't place students."

This reverts commit dcd466b4a92b539524f919a5fdd40a7b5f19a473.