Fixed conflicts

Change-Id: I1b5cb5f267386990623d8c450e3da3c83509d275
Fix TabletUI battery
SystemUI: Fix Tablet UI Date View

Mobile indicator has been removed, is still showed in quicksettings mobile tile.  http://goo.gl/1ZtuS
Fix SystemUI FC / Some moar changes

Change-Id: Ibb92b948b6d572025a2377eadb603b80a0f750fe