[gh-73] Merging from testing into staging

sites/all/modules/imce/css/tree.png

sites/all/modules/imce/css/upload.png

sites/all/modules/imce/css/view-box.png

sites/all/modules/imce/css/view-list.png

sites/all/modules/imce/css/warning.png

sites/all/modules/imce/css/x-resizer.png

sites/all/modules/imce/css/y-resizer.png

sites/all/modules/imce/imce.info

sites/all/modules/imce/inc/imce.admin.inc

sites/all/modules/imce/inc/imce.page.inc

sites/all/modules/imce/js/imce.js

sites/all/modules/imce/js/imce_set_app.js