Error in the last fix

Error in the fix for ambigous filtering, used filter_key instead.
Added return_state color.
Update AdminReturnController.php
Update AdminReturnController.php
Merge branch 'patch-21' of ssh://github.com/djbuch/PrestaShop into djbuch-patch-21
Merge branch 'djbuch-patch-21' into 1.6