address searching
fixed conflict
address searching
?
Merge origin/master

Conflicts:
	app/database/seeds/DatabaseSeeder.php