Reorganized simple token description a little
Merge branch '2.1' into 2.2

* 2.1:
  Reorganized simple token description a little
Documented new tokens for address change notification type
Typo
Merge branch '2.1' into 2.2

* 2.1:
  Typo