refactored squad selection
removed occurences of 'Squad' that where not necessary any more
Merge remote-tracking branch 'origin/refactoring'

Conflicts:
	src/js/game/systems/SquadDisplaySystem.js

conflicts resolved