updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
fixed URL resolving
Merge branch 'master' into ice-cream-sandwich