made showdown-extension configurable via commandline and project-json
Merge branch 'master' of github.com:achingbrain/groc
Merge branch 'custom-index-title'
process block-comments before single-line-comments
Merge branch 'language-path'

Conflicts:
	lib/cli.coffee
Merge remote-tracking branch 'nevir/master'

Conflicts:
	lib/utils.coffee
Merge branch 'showdown-extensions'

Conflicts:
	lib/cli.coffee
Merge branch 'custom-index-title'
Merge branch 'fix-doctag-flags-and-metadata-typo'
Merge branch 'fix-doctags-vs-email-adresses'
make logger white and swap order of descriptions and doctags
reverted swaped order of descriptions and doctags
Merge remote-tracking branch 'nevir/master'
Merge branch 'fix-doctags-vs-email-adresses'
removed preceding comma from and conjuctive
Merge remote-tracking branch 'nevir/master'
added and tweaked several doctags
reenabled email-adress-encoding in author-links
removed brackets around author-links, essentially restoring the original default
updated and added more support for multi-valued arrays in @params and @return-tags, as well as @throw-tags