added author and gravatar
Merge branch 'master' into bloggy
fixed conflict in style