ftyu
hoipu
Merge branch 'hotfixes_5' into develop

Conflicts:
	index.html