type changes
element filter was unsetting data validation rules set to zero (using empty()) changed to using is_null(). now does't unset.
Merge branch 'master' into production

Conflicts:
	css/admin-style.min.css
	css/style.min.css