There are some things, that are not merged:
* replace annotations with related notes completly blocked by T155
* parts that disable parts of korganizer in favour of zanshin (f.ex 222c8e)
* replace kmail TagSelectionWidget with the version in akonadi (all featueres need should be ported)