stupid conflict
image updates
Merge branch 'development'

Conflicts:
	_site/sitemap.xml