lkhjk
Merge branch 'bugfix/6tree'

Conflicts:
	AngularKendoTest/scripts/controllers/mainController.js