Merge branch 'development'
Merge branch 'development'
update portfolio
Merge branch 'development'

Conflicts:
	_site/sitemap.xml
Merge branch 'master' into development