reader
Merge branch 'master' of https://github.com/4clown/starmade-universe-tool

Conflicts:
	eu.4clown.starmade-universe-tool/src/eu/pkg4clown/starmade/universe/tool/CascadingUniverseSheetReader.java