Merge branch 'origin/master'

Conflicts:
	css/widgets.css