x
Merge branch 'master' of github.com:butipanax/logistics_europe

Conflicts:
	app/views/parcels/_form.html.erb