Merge branch 'develop' of github.com:dreamfactorysoftware/dsp-laravel…

… into develop

app/Http/Controllers/SplashController.php

@@ -79,7 +79,6 @@ public static function handleADLdapLogin($provider)
                 $ldapUser = $driver->getUser();
                 $user = $service->createShadowADLdapUser($ldapUser);
                 $user->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
-                //\Auth::login($user, \Request::has('remember'));
                 Session::setUserInfoWithJWT($user);
 
                 return redirect()->intended(env('LANDING_PAGE', '/launchpad').'?token='.Session::getSessionToken());
@@ -117,8 +116,6 @@ public function handleOAuthCallback($serviceName)
 
         $dfUser = $service->createShadowOAuthUser($user);
         $dfUser->update(['last_login_date' => Carbon::now()->toDateTimeString()]);
-
-        //\Auth::login($dfUser);
         Session::setUserInfoWithJWT($dfUser);
 
         if (\Request::ajax()) {

app/Http/Middleware/Limits.php

@@ -1,22 +1,4 @@
 <?php
-/**
- * This file is part of the DreamFactory Rave(tm)
- *
- * DreamFactory Rave(tm) <http://github.com/dreamfactorysoftware/rave>
- * Copyright 2012-2015 DreamFactory Software, Inc. <support@dreamfactory.com>
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 namespace Dreamfactory\Http\Middleware;