renamed appbar.lock.png to app.lock.png
Merge branch 'master' into iap
renamed appbar.lock.png to app.lock.png