Merge branch 'master' into develop

app/config/queue.php

@@ -50,8 +50,9 @@ return array(
 
 		'iron' => array(
 			'driver'  => 'iron',
-			'project' => 'your-project-id',
+			'host'    => 'mq-aws-us-east-1.iron.io',
 			'token'   => 'your-token',
+			'project' => 'your-project-id',
 			'queue'   => 'your-queue-name',
 			'encrypt' => true,
 		),

app/lang/en/validation.php

@@ -33,7 +33,7 @@ return array(
 	"different"            => "The :attribute and :other must be different.",
 	"digits"               => "The :attribute must be :digits digits.",
 	"digits_between"       => "The :attribute must be between :min and :max digits.",
-	"email"            => "The :attribute format is invalid.",
+	"email"                => "The :attribute must be a valid email address.",
 	"exists"               => "The selected :attribute is invalid.",
 	"image"                => "The :attribute must be an image.",
 	"in"                   => "The selected :attribute is invalid.",
@@ -58,7 +58,9 @@ return array(
 	"required"             => "The :attribute field is required.",
 	"required_if"          => "The :attribute field is required when :other is :value.",
 	"required_with"        => "The :attribute field is required when :values is present.",
+	"required_with_all"    => "The :attribute field is required when :values is present.",
 	"required_without"     => "The :attribute field is required when :values is not present.",
+	"required_without_all" => "The :attribute field is required when none of :values are present.",
 	"same"                 => "The :attribute and :other must match.",
 	"size"                 => array(
 		"numeric" => "The :attribute must be :size.",
@@ -80,7 +82,11 @@ return array(
 	|
 	*/
 
-	'custom' => array(),
+	'custom' => array(
+		'attribute-name' => array(
+			'rule-name' => 'custom-message',
+		),
+	),
 
 	/*
 	|--------------------------------------------------------------------------