[gh-163] Merging testing to staging -c860

sites/all/modules/maestro/images/taskconsole/task.gif

sites/all/modules/maestro/images/taskconsole/trace.png

sites/all/modules/maestro/js/admin_template_editor.js

sites/all/modules/maestro/js/jquery.contextmenu.js

sites/all/modules/maestro/js/jquery.simplemodal.min.js

sites/all/modules/maestro/js/maestro_structure_admin.js

sites/all/modules/maestro/js/moderator.js

sites/all/modules/maestro/js/taskconsole.js

sites/all/modules/maestro/js/wz_jsgraphics.js

sites/all/modules/maestro/lib-test.php

sites/all/modules/maestro/maestro.admin.inc

sites/all/modules/maestro/maestro.class.php

sites/all/modules/maestro/maestro.info

sites/all/modules/maestro/maestro.install

sites/all/modules/maestro/maestro.moderator.inc

sites/all/modules/maestro/maestro.module

sites/all/modules/maestro/maestro.test

sites/all/modules/maestro/maestro.views.inc

sites/all/modules/maestro/maestro_base_engine.class.php

sites/all/modules/maestro/maestro_constants.class.php