More integration of assets.
Merged OS X support.