update laravel5 controller extend
git error tweak