Update index.txt
Merge branch 'master' into development

Conflicts:
	doc/index.txt