Re-generate assets
Merge branch 'master' into notification_fix