Update base.html
Update meta description
Merge branch 'source'

Conflicts:
	sitemap.xml