Fix git-flow typo in showdown.
Merge branch 'development'