todo
Merge branch 'master' of https://github.com/carlost7/sph

Conflicts:
	laravel/vendor/autoload.php
	laravel/vendor/composer/autoload_classmap.php
	laravel/vendor/composer/autoload_real.php
Cambios realizados