diff --git a/app/config/app.php b/app/config/app.php
index 3925e64c..155f165b 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -135,35 +135,36 @@ return array(
 
 	'aliases' => array(
 
-		'App'        => 'Illuminate\Support\Facades\App',
-		'Artisan'    => 'Illuminate\Support\Facades\Artisan',
-		'Auth'       => 'Illuminate\Support\Facades\Auth',
-		'Blade'      => 'Illuminate\Support\Facades\Blade',
-		'Cache'      => 'Illuminate\Support\Facades\Cache',
-		'Config'     => 'Illuminate\Support\Facades\Config',
-		'Controller' => 'Illuminate\Routing\Controllers\Controller',
-		'Cookie'     => 'Illuminate\Support\Facades\Cookie',
-		'Crypt'      => 'Illuminate\Support\Facades\Crypt',
-		'DB'         => 'Illuminate\Support\Facades\DB',
-		'Eloquent'   => 'Illuminate\Database\Eloquent\Model',
-		'Event'      => 'Illuminate\Support\Facades\Event',
-		'File'       => 'Illuminate\Support\Facades\File',
-		'Hash'       => 'Illuminate\Support\Facades\Hash',
-		'Input'      => 'Illuminate\Support\Facades\Input',
-		'Lang'       => 'Illuminate\Support\Facades\Lang',
-		'Log'        => 'Illuminate\Support\Facades\Log',
-		'Mail'       => 'Illuminate\Support\Facades\Mail',
-		'Paginator'  => 'Illuminate\Support\Facades\Paginator',
-		'Redirect'   => 'Illuminate\Support\Facades\Redirect',
-		'Redis'      => 'Illuminate\Support\Facades\Redis',
-		'Request'    => 'Illuminate\Support\Facades\Request',
-		'Response'   => 'Illuminate\Support\Facades\Response',
-		'Route'      => 'Illuminate\Support\Facades\Route',
-		'Schema'     => 'Illuminate\Support\Facades\Schema',
-		'Session'    => 'Illuminate\Support\Facades\Session',
-		'URL'        => 'Illuminate\Support\Facades\URL',
-		'Validator'  => 'Illuminate\Support\Facades\Validator',
-		'View'       => 'Illuminate\Support\Facades\View',
+		'App'         => 'Illuminate\Support\Facades\App',
+		'Artisan'     => 'Illuminate\Support\Facades\Artisan',
+		'Auth'        => 'Illuminate\Support\Facades\Auth',
+		'Blade'       => 'Illuminate\Support\Facades\Blade',
+		'Cache'       => 'Illuminate\Support\Facades\Cache',
+		'ClassLoader' => 'Illuminate\Foundation\ClassLoader',
+		'Config'      => 'Illuminate\Support\Facades\Config',
+		'Controller'  => 'Illuminate\Routing\Controllers\Controller',
+		'Cookie'      => 'Illuminate\Support\Facades\Cookie',
+		'Crypt'       => 'Illuminate\Support\Facades\Crypt',
+		'DB'          => 'Illuminate\Support\Facades\DB',
+		'Eloquent'    => 'Illuminate\Database\Eloquent\Model',
+		'Event'       => 'Illuminate\Support\Facades\Event',
+		'File'        => 'Illuminate\Support\Facades\File',
+		'Hash'        => 'Illuminate\Support\Facades\Hash',
+		'Input'       => 'Illuminate\Support\Facades\Input',
+		'Lang'        => 'Illuminate\Support\Facades\Lang',
+		'Log'         => 'Illuminate\Support\Facades\Log',
+		'Mail'        => 'Illuminate\Support\Facades\Mail',
+		'Paginator'   => 'Illuminate\Support\Facades\Paginator',
+		'Redirect'    => 'Illuminate\Support\Facades\Redirect',
+		'Redis'       => 'Illuminate\Support\Facades\Redis',
+		'Request'     => 'Illuminate\Support\Facades\Request',
+		'Response'    => 'Illuminate\Support\Facades\Response',
+		'Route'       => 'Illuminate\Support\Facades\Route',
+		'Schema'      => 'Illuminate\Support\Facades\Schema',
+		'Session'     => 'Illuminate\Support\Facades\Session',
+		'URL'         => 'Illuminate\Support\Facades\URL',
+		'Validator'   => 'Illuminate\Support\Facades\Validator',
+		'View'        => 'Illuminate\Support\Facades\View',
 
 	),
 
diff --git a/app/start/global.php b/app/start/global.php
index 37fd0c16..dbebd1f4 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -1,5 +1,23 @@
 <?php
 
+/*
+|--------------------------------------------------------------------------
+| Register The Laravel Class Loader
+|--------------------------------------------------------------------------
+|
+| In addition to using Composer, you may use the Laravel class loader to
+| load your controllers and models. This is useful for keeping all of
+| your classes in the "global" namespace without Composer updating.
+|
+*/
+
+ClassLoader::register(new ClassLoader(array(
+
+	app_path().'/controllers',
+	app_path().'/models',
+
+)));
+
 /*
 |--------------------------------------------------------------------------
 | Application Error Logger