Merge remote-tracking branch 'origin' into pruebas_orm

Conflicts:
	app/models/Country.php
	app/models/User.php
Merge branch 'pruebas_orm' of github.com:Stolz/laravel into pruebas_orm

Conflicts:
	app/models/User.php
Gettext
Autoexclude self when using 'unique' validation rule