Merge branch 'master' into gh-pages
replaced fonts and color for nag bar
Merge branch 'gh-pages'