implementing controller for returns
Merge remote-tracking branch 'origin/master'
fixed test
Merge remote-tracking branch 'origin/master'