Sprightly button decision moved to controller side
removed commented code
merging head back
Merge pull request #515 from nla/sc-dcs-119

Sc dcs 119, great, merged.