Merge origin/master

Conflicts:
	app/Resources/assets/css/header.scss
	app/Resources/assets/css/main.scss
	web/css/upandtravel.css