Updated configurations
Update
Merge branch 'master' of https://github.com/giraldomauricio/prails

Conflicts:
	config/dev.php
	config/prod.php
	config/stg.php
	config/test.php