company_name added 2
Conflicts:
	registration/index.php