Merge branch 'master' of https://github.com/hatted/data-validation

Conflicts:
	phpinfo.php