Merge remote-tracking branch 'origin/Pavel_sakharov' into Pavel_sakharov

Conflicts:
	include/metro.css