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