Implement basic state resolver and shipping states for order
Missed conflict
Add mink selenium2 driver, fix data context
Fix CS and typos

Conflicts:

	src/Sylius/Bundle/ShippingBundle/Model/ShipmentInterface.php
Merge pull request #487 from Sylius/order-states

Implement basic state resolver and shipping states for order