Cleaned up rendering of Units for #211
Merge remote-tracking branch 'origin/master'
#211 Demoing fixed size circles behind Units