editing working with dblclick
Merge branch 'shane' into 3.0