Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/controllers/treeCtrl.js
	source/directives/uiTree.js
	source/directives/uiTreeNode.js