worked on asset pipelin
fixed merge conflicts, added asset pipeline hot fixes