update
update
update
Merge branch 'master' into gh-pages

Conflicts:
	app/favicon.ico
	app/index.html