Initial commit for Site menu icons.
Progress to-date for menu icons.
Removed a whack line of code in template.php that caused the site header
to display incorrectly.
Adding additional class 'has-icon'.
Merge remote branch 'origin/dev' into dev
Resolved the conflicts.
Conflicts:
	template.php