-Fixed issue with tile images flickering from being unloaded at the wrong time.
-Merged master.
-Added master optimizations to the branch.