#1772: Removed unnecessary subproject (not included in solution). Merged changes from tree layout branch.