re-added crm_connection for better CRMing
change type to Type in Contact
changed edmanager position to mentor manager
Merge branch 'mentor-manager'
Change ed manager to mentor manager
added full support for the How Did You Hear About Us field in the enrollment form
Merge branch 'master' into self-serve-signup

for the release of the 'how did you hear about us' field in the enrollment form.