introduce FEEDBACK_ENVELOPE_SENDER setting instead of hardwiring envelope sender; use SERVICE_NAME for the feedback message subject line
Resolved conflict in WebController.php
Merge branch 'master' of https://github.com/NatLibFi/Skosmos

Conflicts:
	controller/WebController.php