bdd
Merge branch 'master' of https://github.com/sheebypanda/laravale

Conflicts:
	app/config/database.php