fix
fix
fix
Merge branch 'develop'

Conflicts:
	app/views/index.phtml
	www/sitemap.xml