update
Merge branch 'master' of https://github.com/waar19/appinstarespuesta

Conflicts:
	app/Config/database.php