Pre-merge with develop

Hi Vivek,

This is the pre-merge with the develop branch.  It includes all of the treeview changes I've done so far and other changes that develop has had vs. your dev branch.

I already have this branch merged with eto/develop, but this will get you up to date.