Header partially implemented
Sidebar featured items
Merge branch 'master' into HEAD

Conflicts:
	.gitignore