updated ChangeLog, yota messages
Merge branch 'master' into ice-cream-sandwich
updated resources
Merge branch 'master' into ice-cream-sandwich
updated resources
Merge branch 'master' into ice-cream-sandwich