Little fixes
Merge branch 'master' into gh-pages
Changed primary color
Merge branch 'master' into gh-pages