icon
Merge remote-tracking branch 'origin/master' into rendering
fix layers
use old layers - maybe yBuffering tomorrow
camera and resizing
camera fix 1
Merge remote-tracking branch 'origin/master' into rendering