Merge branch 'master' into dev
new favicon
author page
minor
Merge branch 'dev'