Initial 1.5.2 port commit.
Corrected for 1.5.2 file structure.
Removed references to asset system.
Finished 1.5.2 port.
Added separate versions for merge to master.