app:selectbyshape Minor edits
app:tools: options for content select
 app: selectbycontent added few header files