TREE-31
Added location
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/crispysoft/tree/ui/bbeans/FamilyBBean.java
Merge fixed