Upstream changes

Here's some updates. upstream mainly. also the tmobile one has the correct battery images now