update from PC
new validation
Merge remote-tracking branch 'origin/redesign' into redesign

Conflicts:
	inc/validation.php