q
Merge branch 'master' of github.com:alopia/qw

Conflicts:
	Q/Validators/ValidatorRule.php