added required_without_all
shifted alignment
Updating .htaccess for consistency

Fixing indentation to be consistent
Merge pull request #2508 from euantorano/patch-1

Updating .htaccess for consistency
Merge pull request #2389 from anlutro-pull-requests/validator-require-without-all

Added required_without_all
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	app/lang/en/validation.php