fix composer.json

fix conflicts

fix conflicts

	modified:   app/config/app.php
	modified:   app/config/database.php
	modified:   app/models/Credential.php
	modified:   app/models/Social.php
	modified:   app/models/User.php
	modified:   app/routes.php
	modified:   composer.json