Follow up on account preferences review.
Merge remote-tracking branch 'origin/newframework' into accountpreferences
Re-enable the i18n debug language
Merge branch 'accountpreferences' of git://github.com/bp323/3akai-ux into accountpreferences

Conflicts:
	ui/bundles/es_ES.properties
Some minor clean-up