Merge branch 'master' into design

Conflicts:
	css/style.css