Redirect to https:// if REQUIRE_SSL is set [story:47145383]
Story 47146275: Alerting user in control mapping popup when a control is not mapped to any section

Conflicts:

	app/assets/mustache/controls/show_selector.mustache
Fix Controls import to use correct headings [story:47124867]
Merge remote-tracking branch 'github/canary'