Admin +  settings
link reset db
inital commit for the importer
Merge branch 'importer'

Conflicts:
	inc/header.php