Initial version gh-pages
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	src/coffee/app.coffee