async
Merge branch 'master' of github.com:cnduru/sw7

Conflicts:
	report/indhold/theframework/design-server.tex
Merge branch 'master' of github.com:cnduru/sw7