Using XBL bindings for key list and identities instead of 'templates'
Merge branch 'refactor/bindings'

Conflicts:
	package/chrome/content/ui/preferences.js
	package/chrome/content/ui/preferences.xul