[gh-163] Merging testing to staging -c860

sites/all/modules/maestro/images/admin/corners/tl-wht2.png

sites/all/modules/maestro/images/admin/corners/tl-yel.png

sites/all/modules/maestro/images/admin/corners/tl.png

sites/all/modules/maestro/images/admin/corners/tm-bl.png

sites/all/modules/maestro/images/admin/corners/tm-grn.png

sites/all/modules/maestro/images/admin/corners/tm-gry.png

sites/all/modules/maestro/images/admin/corners/tm-red.png

sites/all/modules/maestro/images/admin/corners/tm-yel.png

sites/all/modules/maestro/images/admin/corners/tr-bge.png

sites/all/modules/maestro/images/admin/corners/tr-bl.png

sites/all/modules/maestro/images/admin/corners/tr-cl.png

sites/all/modules/maestro/images/admin/corners/tr-grn.png

sites/all/modules/maestro/images/admin/corners/tr-gry.png

sites/all/modules/maestro/images/admin/corners/tr-red.png

sites/all/modules/maestro/images/admin/corners/tr-wht.png

sites/all/modules/maestro/images/admin/corners/tr-wht2.png

sites/all/modules/maestro/images/admin/corners/tr-yel.png

sites/all/modules/maestro/images/admin/corners/tr.png

sites/all/modules/maestro/images/admin/delete.gif

sites/all/modules/maestro/images/admin/edit_properties.gif