updated ChangeLog, yota messages
Merge branch 'master' into beta

Conflicts:
	ChangeLog
updated resources
Merge branch 'master' into beta
updated resources
Merge branch 'master' into beta