add commandsOptions.netmout.*.done (function object) & use in dropbox
add commandsOptions.netmout.*.done (function object)
Merge branch 'netmount' into dropbox
fix typo commandsOptions.netmount.dropbox
add connector cmd `callback` for netmount authorizing etc...
Merge branch 'netmount' into pixlr_edit

Conflicts:
	css/toolbar.css
	js/elFinder.options.js
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
	php/elFinder.class.php
[pixlr] use elfinder::callback
[dropbox] use elfinder::callback
Merge branch 'netmount' into dropbox
[i18n] tiny edit (white space)
Merge branch 'pixlr_edit' into dropbox_pixlr
Merge branch 'dropbox_pixlr' into 2.1_n

Conflicts:
	css/toolbar.css
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
	php/elFinder.class.php