headerController updated

Conflicts:
	app/scripts/controllers/headerController.js