Merge branch 'hotfix/google_authorship'
remove anoying vertical scroll on code blocks
Merge branch 'develop'
update Angular to version 1.0.5 and add html to Rainbow.js
Merge branch 'develop'
fix snapshot for the welcome page (map '' to '/')