Pulls changes in thunder cloud assets
Merge branch 'fix/assets' into develop