Fixed option selection proto and added it back to the cmake file
Merge branch 'master' of github.com:CURG/rpcz

Conflicts:
	graspit_rcpz/common/get_option_selection.proto