+ fix for editing decision tree node in admin.
+ update release
Merge branch 'master' into release/1.6

Conflicts:
	controllers/AdminController.php