Design v2 + Java Doc
Merge branch 'designv2'

Conflicts:
	src/Client/ConcreteClient.java