Merge branch 'master' into pr/25

Conflicts:

articles/2013-10-25-binaergewitter-talk-number-71-sprich-mit-der-wolke.m
arkdown