change logo image
Merge branch 'master' of https://github.com/smocanas/lia_voyage

Conflicts:
	config/doctrine/schema.yml
	data/sql/schema.sql
	web/css/main.css