Merge branch 'master' of https://github.com/riddles8888/LaravelBase

Conflicts:
	.gitignore
	README.md
	app/config/app.php
	app/config/database.php
	app/config/mail.php
	app/config/session.php
	app/controllers/BaseController.php
	app/controllers/HomeController.php
	app/database/seeds/DatabaseSeeder.php
	app/filters.php
	app/models/BaseModel.php
	app/models/User.php
	app/routes.php
	app/start/global.php
	app/start/local.php
	app/tests/ExampleTest.php
	app/views/home/index.blade.php
	app/views/home/login.blade.php
	app/views/layouts/default.blade.php
	artisan
	bootstrap/autoload.php
	bootstrap/start.php
	composer.json
	public/.htaccess
	public/css/bootstrap.css
	public/favicon.ico
	public/index.php
	public/js/bootstrap.js
	public/js/bootstrap.min.js
	public/js/jquery.js

Author: stygiansabyss

.gitignore

@@ -2,4 +2,7 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store
+=======
+.DS_Store
+error_log

app/config/app.php

@@ -60,12 +60,12 @@
 	|--------------------------------------------------------------------------
 	|
 	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, long string, otherwise these encrypted values will not
-	| be safe. Make sure to change it before deploying any application!
+	| to a random, 32 character string, otherwise these encrypted strings
+	| will not be safe. Please do this before deploying an application!
 	|
 	*/
 
-	'key' => 'YourSecretKey!!!',
+	'key' => '',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -113,7 +113,7 @@
 		'Illuminate\Validation\ValidationServiceProvider',
 		'Illuminate\View\ViewServiceProvider',
 		'Illuminate\Workbench\WorkbenchServiceProvider',
-
+		'Way\Generators\GeneratorsServiceProvider'
 	),
 
 	/*

app/config/mail.php

@@ -11,11 +11,11 @@
 	| sending of e-mail. You may specify which one you're using throughout
 	| your application here. By default, Laravel is setup for SMTP mail.
 	|
-	| Supported: "smtp", "mail"
+	| Supported: "smtp", "mail", "sendmail"
 	|
 	*/
 
-	'driver' => 'mail',
+	'driver' => 'smtp',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -27,7 +27,6 @@
 	| the Postmark mail service, which will provide reliable delivery.
 	|
 	*/
-
 	'host' => '127.0.0.1',
 
 	/*
@@ -95,4 +94,30 @@
 
 	'password' => null,
 
+	/*
+	|--------------------------------------------------------------------------
+	| Sendmail System Path
+	|--------------------------------------------------------------------------
+	|
+	| When using the "sendmail" driver to send e-mails, we will need to know
+	| the path to where Sendmail lives on this server. A default path has
+	| been provided here, which will work well on most of your systems.
+	|
+	*/
+
+	'sendmail' => '/usr/sbin/sendmail -bs',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Mail "Pretend"
+	|--------------------------------------------------------------------------
+	|
+	| When this option is enabled, e-mail will not actually be sent over the
+	| web and will instead be written to your application's logs files so
+	| you may inspect the message. This is great for local development.
+	|
+	*/
+
+	'pretend' => false,
+
 );

app/config/session.php

@@ -15,7 +15,6 @@
 	|            "memcached", "redis", "array"
 	|
 	*/
-
 	'driver' => 'native',
 
 	/*
@@ -134,5 +133,4 @@
 	*/
 
 	'payload' => 'laravel_payload',
-
 );