updated ChangeLog
Merge branch 'yota2' into betayota

Conflicts:
	ChangeLog