Merge branch 'boris' into development

Conflicts:
	index.html
Merge branch 'miguel' into development

Conflicts:
	index.html
rr
Merge branch 'development'

Conflicts:
	index.html