Some more package refactoring
Merge branch 'master' of https://github.com/Tetr4/Spacecurl.git

Conflicts:
	SpaceCurl/src/de/klimek/spacecurl/FreePlayActivity.java
	SpaceCurl/src/de/klimek/spacecurl/MainActivityPrototype.java
	SpaceCurl/src/de/klimek/spacecurl/TrainingActivity.java
	SpaceCurl/src/de/klimek/spacecurl/game/GameUniversal.java
	SpaceCurl/src/de/klimek/spacecurl/game/GameUniversal3D.java
	SpaceCurl/src/de/klimek/spacecurl/training/TrainingBuilderActivity.java
	SpaceCurl/src/de/klimek/spacecurl/util/collection/Database.java
	SpaceCurl/src/de/klimek/spacecurl/util/collection/training/Training.java