fixing role
Merge branch 'master' of https://github.com/plansys/Plansys

Conflicts:
	components/ui/FormBuilder.js.php