Merge remote-tracking branch 'origin/master'

Conflicts:
	code/assets/css/style.css