Updating stuff about client
Merge branch 'master' of https://github.com/cnduru/sw7

Conflicts:
	report/indhold/thegame/components.tex
	report/indhold/thegame/designClient/application.tex
Fix from merge error