Merge branch 'master' into scholarship

Conflicts:
	.meteor/versions
	schemas/_fields.js
added elements and style to scholarships
more scholarship improvements and mixpanel tracking
Merge branch 'scholarship' of github.com:AdmitHub/Admit into scholarship
Upgrade meteor and tool version
Merge branch 'scholarship'
Merge branch 'master' into sms

Conflicts:
	schemas/_fields.js