updated the history file
Merge branch 'fix_asset_pipeline'