Merge changes for STORM-2008

"Remove from outfit" should deactivate gestures in a folder as well as take off items
Credit to Lance Corrimal