Client Big Design Update
Merge branch 'master' of
https://github.com/Seiseikatsu/dhbwStarbattle.git

Conflicts:
	StarBattle_Server/StarBattle.h2.db
	StarBattle_Server/StarBattle.lock.db