doc ...
Merge branch 'master' of https://github.com/AngewandteSystemprogrammierungSS14/jefax

Conflicts:
	doc/JefaxDesign.pdf