Merge branch 'develop' of github.com:butipanax/logistics_europe into develop

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'develop' of github.com:butipanax/logistics_europe into develop

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'develop' of github.com:butipanax/logistics_europe into develop

Conflicts:
	app/views/layouts/application.html.erb
dpd