Fix wrong scaling of QS tiles

Also increase margin with the number of tiles shown
and tweak sizes for better usability

PS2: Whitespace fix

Change-Id: I78a1e0d41d487ac48edc5f8992b7d5c95fbbfa71
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	packages/SystemUI/res/layout/quick_settings_tile_basic.xml

Change-Id: Ifb84b40b68a08db20c1866d6950069afb56d3dea