added diskussion.tex part; modified bib to point to new urls
Merge branch 'master' of https://github.com/akonring/dekspsys-2013
typos