- Merged and added homemade changes
- Lots of small improvements
- Changed literatur.bib and bibtex-integration in order to be able to
  have online resources, such as links to articles and websites

Signed-off-by: Markus Germann <MarkusGermann>
Merge remote-tracking branch 'refs/remotes/origin/master'

- Most of the conflcts were caused by different operating system file
  paths

Conflicts:
	praxisbericht.aux
	praxisbericht.lof
	praxisbericht.log
	praxisbericht.pdf
	praxisbericht.synctex.gz
	praxisbericht.tex
	praxisbericht.toc