Merge develop

Conflicts:
	web/index3.xml