Merge origin/master

Conflicts:
	assets/mine/css/global.css
	assets/mine/css/header.css
	assets/mine/css/menu.css