Simulatordiscussions: merging deliverables

We will meet in S3|06 room 348