progress bars, status icons, html5 tags, gitignore
merge
Merge branch 'master' into gh-pages

Conflicts:
	fire_app_log.txt