main pages with erb template, menu highlight
Merge branch 'master' into gh-pages

Conflicts:
	fire_app_log.txt