Merge change Ief544bc6 into eclair-mr2

* changes:
  fix grammar in the grant permissions UI