edited header-links to check for import
edited import/index.html to put the header on top
edited path definitions on header-links.html
Merge http://github.com/welred/asset-manager

Conflicts:
	assets/assets/templates/header-links.html
	assets/assets/templates/import/index.html