Algunas cosas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Recursum/Entities/Recurso.php
	app/Recursum/Repositories/RecursoRepo.php
	app/controllers/HomeController.php
	app/controllers/RecursoController.php
	app/database/seeds/RecursoTableSeeder.php
	app/routes.php
Merge branch 'master' of https://github.com/bacabange/recursum