action icons, progress bars, sass mixin
log
Merge branch 'master' into gh-pages

Conflicts:
	fire_app_log.txt