Models
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/database/seeds/DatabaseSeeder.php
	app/database/seeds/TipousuarioTableSeeder.php
	app/models/Tipousuarios.php