Revert "quick addition of button with stubbed out handler"

This reverts commit f84501446a7ddb7d17bc4681ae7ba2e5b8970241.
update to SVN 1130
up to SVN revision 1135 (9/21/2012 by Graham)
Up to SVN Revision 1136 (9/28/2012 by Graham)
Update to SVN 1186 (05/17/2013 by Graham)
Merge up to SVN 1186 (05/17/2013 by Graham)
Cleanup merge problems.