changed techtree
last changes to techtree
DUBSPLOSION
adjusted the rocket
Merge branch '16_rocketGraphics' of https://github.com/Metha-Gruppe/micropolis-java into 16_rocketGraphics
fixed sound playback
fixed sound timing
Merge branch '16_rocketGraphics' of https://github.com/Metha-Gruppe/methapolis-java into 16_rocketGraphics
merged
rocket speed adjustments
merged
image for rocket tool
Merge branch 'master' of https://github.com/Metha-Gruppe/methapolis-java into 18_reswindow

Conflicts:
	src/micropolisj/engine/Micropolis.java
	src/micropolisj/research/ResearchState.java