fire.app build for gh-pages
clean build
Merge branch 'master' into gh-pages

Conflicts:
	fire_app_log.txt