Bug 894200 - [Usage] Progress indicator need to update to new BB or @1.5x assets of old version
Bug 894802 - [System] Status bar shows time when it is in lockscreen
Bug 896231 - hdpi resolution tweaks update for System app
Merge pull request #11069 from basiclines/costcontrol-fixes

Bug 894200 - [Usage] Progress indicator need to update to new BB or @1.5x assets of old version
Bug 894865 - Implement UI for active merge with suggestions from contact detail
Merge pull request #11081 from cctuan/master-system-fix

Bug 896231 - hdpi resolution tweaks update for System app
Merge pull request #11078 from cctuan/894802

Bug 894802 - [System] Status bar shows time when it is in lockscreen
Merge pull request #11049 from crdlc/bug-894865

Bug 894865 - Implement UI for active merge with suggestions from contact...
Bug 894338 - Fix Sao Paulo name
Merge pull request #11116 from lissyx/bug894338

Bug 894338 - Fix Sao Paulo name, r=kaze
Merge branch 'content2' of https://github.com/KevinGrandon/gaia into rocketbar-1.2
Rocketbar overlay & homescreen icon
apps search working
Apps search working in Rocketbar
Merge remote-tracking branch 'michalbe/rocketbar-1.2' into content2

Conflicts:
	apps/homescreen/index.html