Merge branch '2.x' into pixlr_edit

Conflicts:
	elfinder.src.html
	js/elFinder.options.js
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
	php/elFinder.class.php
Merge branch 'volume_icon' into 2.x_n
Merge branch '2.x' into 2.x_n

Conflicts:
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
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
fix last merge mistake
fix white space
Merge branch '2.x' into pixlr_edit

Conflicts:
	js/i18n/elfinder.en.js
fix cmd "pixlr" missing custom data return from pixlr.com
simply last commit (@25fe5c9a0d)
[cmd:pixlr] fix problem of relative path of `URL` & `urlUpload`
Merge branch 'pixlr_edit' into 2.x_n

Conflicts:
	js/commands/pixlr.js
	js/elFinder.options.js
	js/i18n/elfinder.en.js
	js/i18n/elfinder.jp.js
	php/elFinder.class.php
Merge branch '2.x_n' into 2.1_n