Assets.
Merge branch 'angular-players' of github.com:mrmrs/mrsjxn into angular-players