dudum
Merge branch 'master' into Roamer2

Conflicts:
	Hidiho.txt