Merge branch '2.x' into netmount

Conflicts:
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
	php/elFinder.class.php
[cmd:netmount] fix initialization of protocol
Merge branch 'netmount' into dropbox
Merge branch 'dropbox' into 2.x_n

Conflicts:
	js/i18n/elfinder.en.js
	php/elFinder.class.php