remove .gitkeep from uploads folder
Merge branch 'master' into plugins
Merge branch 'plugins' into theme-metrolium
Merge remote-tracking branch 'boilerplate/theme-metrolium'