Added asset.html
Merge branch 'master' into darick/develop