Merge remote-tracking branch 'upstream/gh-pages' into css-tweaks

Conflicts:
	css/brackets.io.css
	index.html