updated ChangeLog
Merge branch 'yota2' into yotabeta

Conflicts:
	ChangeLog