Merge origin/master

Conflicts:
	project/common/header.php
	project/css/common.css