markup, bugfix in detail template
Merge branch 'master' of github.com:benvand/benspotatoblog