Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	sass/screen.scss
	stylesheets/screen.css