Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
support folder uplading with Google Chrome
remove system files on folder uploading

remove next files
win: desktop.ini & thumbs.db
mac: .ds_store
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
add lock marker into locked items on tree & cwd
Merge branch 'lock_marker' into 2.x_n

Conflicts:
	img/toolbar.png
correction of Merge branch 'lock_marker' into 2.x_n
Merge branch '2.x_n' into 2.1_n