merge
Merge remote-tracking branch 'upstream/master'
added error pages for dev environment

we should think of doing that for production, too
merge
Merge remote-tracking branch 'upstream/master'
merge from upstream
Merge pull request #87 from leider/master

neuer tag - neuer pull request