Merge branch 'master' of https://github.com/sebastian-porling/Bloggen.git/