[#687 state:resolved] Option to send emails on team consultation responses
Merge branch 'master' into jquery
should fix build
Merge branch 'master' into jquery
[#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
revert drafts by user as part of flags as this would mess up caching.    Also adjust windows_live check
Merge branch 'master' into jquery

Conflicts:
	app/helpers/application_helper.rb
	spec/helpers/flags_helper_spec.rb
oops
Merge branch 'master' into jquery
spec for windows_live?
Merge branch 'master' into jquery
fix jquery build
Merge branch 'jquery' into rails3.2_ruby_1.9.3

Conflicts:
	spec/models/user_group_assignment_spec.rb
update travis
Merge branch 'master' into jquery
Merge branch 'jquery' into rails3.2_ruby_1.9.3