Fixed order controller tests
Merge conflict on the admin orders index fixed
Merge branch 'master' of github.com:novohispano/store_engine