keep important folders: wp-content/uploads and wp-content/uprgades
Merge branch 'master' into develop