Merge branch 'master' into develop

.gitattributes

-* text=auto
\ No newline at end of file
+* text=auto

.gitignore

@@ -5,4 +5,4 @@ composer.lock
 .env.local.php
 .env.php
 .DS_Store
-Thumbs.db
\ No newline at end of file
+Thumbs.db

CONTRIBUTING.md

 # Contribution Guidelines
 
-Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
\ No newline at end of file
+Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!

app/config/app.php

@@ -54,6 +54,19 @@ return array(
 
 	'locale' => 'en',
 
+	/*
+	|--------------------------------------------------------------------------
+	| Application Fallback Locale
+	|--------------------------------------------------------------------------
+	|
+	| The fallback locale determines the locale to use when the current one
+	| is not available. You may change the value to correspond to any of
+	| the language folders that are provided through your application.
+	|
+	*/
+
+	'fallback_locale' => 'en',
+
 	/*
 	|--------------------------------------------------------------------------
 	| Encryption Key

app/config/compile.php

@@ -15,4 +15,4 @@ return array(
 
 
 
-);
\ No newline at end of file
+);

app/config/mail.php

@@ -24,7 +24,7 @@ return array(
 	|
 	| Here you may provide the host address of the SMTP server used by your
 	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
+	| the Mailgun mail service which will provide reliable deliveries.
 	|
 	*/
 
@@ -37,7 +37,7 @@ return array(
 	|
 	| This is the SMTP port used by your application to delivery e-mails to
 	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
+	| stay compatible with the Mailgun e-mail applications by default.
 	|
 	*/
 

app/config/remote.php

@@ -56,4 +56,4 @@ return array(
 
 	),
 
-);
\ No newline at end of file
+);

app/config/testing/cache.php

@@ -17,4 +17,4 @@ return array(
 
 	'driver' => 'array',
 
-);
\ No newline at end of file
+);

app/config/testing/session.php

@@ -18,4 +18,4 @@ return array(
 
 	'driver' => 'array',
 
-);
\ No newline at end of file
+);

app/config/workbench.php

@@ -28,4 +28,4 @@ return array(
 
 	'email' => '',
 
-);
\ No newline at end of file
+);

app/controllers/BaseController.php

@@ -15,4 +15,4 @@ class BaseController extends Controller {
 		}
 	}
 
-}
\ No newline at end of file
+}

app/controllers/HomeController.php

@@ -20,4 +20,4 @@ class HomeController extends BaseController {
 		return View::make('hello');
 	}
 
-}
\ No newline at end of file
+}

app/database/seeds/DatabaseSeeder.php

@@ -14,4 +14,4 @@ class DatabaseSeeder extends Seeder {
 		// $this->call('UserTableSeeder');
 	}
 
-}
\ No newline at end of file
+}

app/filters.php

@@ -87,4 +87,4 @@ Route::filter('csrf', function()
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}
-});
\ No newline at end of file
+});

app/lang/en/pagination.php

-<?php 
+<?php
 
 return array(
 
@@ -17,4 +17,4 @@ return array(
 
 	'next'     => 'Next &raquo;',
 
-);
\ No newline at end of file
+);

app/models/User.php

@@ -49,4 +49,4 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
 		return $this->email;
 	}
 
-}
\ No newline at end of file
+}

app/routes.php

@@ -14,4 +14,4 @@
 Route::get('/', function()
 {
 	return View::make('hello');
-});
\ No newline at end of file
+});

app/tests/ExampleTest.php

@@ -14,4 +14,4 @@ class ExampleTest extends TestCase {
 		$this->assertTrue($this->client->getResponse()->isOk());
 	}
 
-}
\ No newline at end of file
+}

app/views/emails/auth/reminder.blade.php

@@ -10,4 +10,4 @@
 			To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>

artisan

@@ -21,7 +21,7 @@ require __DIR__.'/bootstrap/autoload.php';
 |--------------------------------------------------------------------------
 |
 | We need to illuminate PHP development, so let's turn on the lights.
-| This bootstrap the framework and gets it ready for use, then it
+| This bootstraps the framework and gets it ready for and then it
 | will load up this application so that we can run it and send
 | the responses back to the browser and delight these users.
 |
@@ -71,4 +71,4 @@ $status = $artisan->run();
 
 $app->shutdown();
 
-exit($status);
\ No newline at end of file
+exit($status);

phpunit.xml

@@ -15,4 +15,4 @@
             <directory>./app/tests/</directory>
         </testsuite>
     </testsuites>
-</phpunit>
\ No newline at end of file
+</phpunit>

public/robots.txt

 User-agent: *
-Disallow: 
+Disallow:

readme.md

 ## Laravel PHP Framework
 
-[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework) 
+[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)
 
 Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.