Fix nil data
Grab data instead of status
Merge branch 'distribution-plugin' into cirandas

Conflicts:
	plugins/orders/models/orders_plugin/order.rb