Key icons and buttons
Merge branch 'master' of github.com:ag-mailcrypto/storm-plugin

Conflicts:
	package/chrome/content/Keyring.jsm