stylesheet redo;
Merge branch 'master' of github.com:butipanax/logistics_europe

Conflicts:
	app/views/parcel_settlements/settle.html.erb
;