Merge origin/master
Merge origin/master

Conflicts:
	css/guide.css
	guide.html
Merge origin/master

Conflicts:
	css/guide.css
	guide.html