Icons, Atlases, and test scenes.
Merge remote-tracking branch 'origin/master'