[#711 state:resolved]  Option to smart-expand team consultation section on student profile   [#726 state:resolved] make session cooke secure on ssl sites (currently staging and production)  Also break up multiline labels on the district settings page.
Merge branch 'master' into jquery

Conflicts:
	app/views/students/_team_consultations.html.erb
fix spec after mege