print simulation environment borders
fixed merge conflict
simsim cleaned
simsim re-cleaned
Merge remote branch 'upstream/master' into CamSimMerge