[ui,cmd:places] support contextmenu, touch devices
Merge branch '2.1' into 2.1_n

Conflicts:
	js/elFinder.options.js