* finish fixing merge conflict by readding my changes to dummy responder in its new location
* finish fixing merge conflict by readding my changes to dummy responder in its new location

dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen