Merge branch 'hotfix_0.6.12'
removed trailing space
fixing identation
Added specs to make sure deletions in the trade admin interface are working
Fix the specs, making sure that it was finding the bug that we were looking for (using params instead of search_params on the action destroy_batch of trade/shipments_controller
Merge branch 'hotfix_0.6.13'
properly resolve the report type
don't send 'raw' report_type from frontend
make the id column internal
Pass search_params to the logger instead of just params
Merge branch 'hotfix-0.6.14'
Merge branch 'master' into release-0.7.0

Conflicts:
	spec/controllers/trade/shipments_controller_spec.rb