Merge origin/master

Conflicts:
	css/global.css