20140822
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	main.js