Fix PowerLevels as per latest Gonk specification
Merge branch 'master' of ssh://github.com/svic/gaia into ShrinkUI

Conflicts:
	apps/system/js/nfc_manager.js