Ignore uploaded assets
Merge branch 'staging'