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

Conflicts:
	modules/dev/forms/DevUser.php