Merge remote-tracking branch 'origin/master'

Conflicts:
	ui/app/src/main/java/org/activityinfo/ui/app/client/chrome/tree/NavigationTree.java
	ui/app/src/main/java/org/activityinfo/ui/app/client/chrome/tree/NavigationTreeModel.java
	ui/style/src/main/java/org/activityinfo/ui/style/tree/TreeComponent.java