merged events and event options, can now properly search for only one club
merged events and event options, can now properly search for only one club

philellwood/nclapp,philellwood/nclapp,philellwood/nclapp,philellwood/nclapp,philellwood/nclapp