Merge branch 'hotfix/use_offline_stuff'
Merge branch 'release/v0.4.1'
Merge branch 'release/v0.4.2'
Merge branch 'release/v0.4.3'
Merge branch 'release/v0.4.4'
Merge branch 'release/v0.4.5'
Merge branch 'release/v0.4.6'
Merge branch 'release/v0.4.7'
Merge branch 'release/v0.4.8'
Merge branch 'release/v0.4.9'
Merge branch 'release/v0.4.11'
switch from PHPmarkdown to parsedown, allows for github-flavoured markdown, is faster. closes #34
Revert "switch from PHPmarkdown to parsedown, allows for github-flavoured markdown, is faster. closes #34"

This reverts commit 53ca70a36e33688155d110d214d0c896a9467b43.
switch from PHPmarkdown to parsedown, allows for github-flavoured markdown, is faster. closes #34
improve documentation, add a number of user-styles, closes #33
small changes to docs and team text
Merge branch 'release/v0.4.10'

Conflicts:
	webroot/assets/main.css
Merge branch 'master' into develop