~ added resources for Feedback-Box
Merge remote-tracking branch 'origin/master'