Merge origin/master

Conflicts:
	config/config.php
	modules/data/form7.php
	modules/data/form_criteria.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	config/config.php
	modules/data/form7.php
	modules/data/form_criteria.php
	nbproject/project.properties