path fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/styles/style.css
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit db367f1ccc1f8c33e3cf4eb8d6af3dc83602ada5.