Removed assets-merger.
Added assets module.
Enabled the new assets module, and disabled assets-merger.
Started migrating over asset-merger code to assets system.