Controller, combined systems.

Combined the TimeSystem and WaveManager in the same scene.