related_work and architecture
Merge branch 'master' of github.com:Onkeliroh/Projekt-SS2013

Conflicts:
	documentation/documentation.synctex.gz