remove system files on folder uploading

remove next files
win: desktop.ini & thumbs.db
mac: .ds_store
Merge branch '2.1' into 2.1_n