Brush selection updates
Bugs fixes for initial live test
Merge branch 'SWTemplate' into development