some asset fixes
Merge branch 'master' into feature/tabbed-event-management