Merge origin/master

Conflicts:
	style/css/dev-style.css