added jquery file upload plugin to asset pipleline
asset pipeline mod
fixed merge issues