add wp-uploads folder
remove custom uploads folder from .gitignore
Merge remote-tracking branch 'origin/master'