Merge branch 'master' of github.com:bicpi/AwsSesFeedbackReporter

Conflicts:
	web/index.php
Merge branch 'master' of github.com:bicpi/AwsSesFeedbackReporter