x
Merge remote-tracking branch 'origin/ghpages-working' into ghpages-working

Conflicts:
	scripts/build/wipeoutDocs.js
	scripts/lib/wipeout-0.3.1.js
Revert "Merge remote-tracking branch 'origin/ghpages-working' into ghpages-working"

This reverts commit 5eddb63895af1f9628407b76f526898e04a28f3f.