Correctly merge the text-annotation branch.

    REVIEW: 111914
    FEATURE: Add support for annotations to Words and Author

Squashed commit of the following:

commit c26f5aa2
Merge: 955818d3 bbecfa55
Author: C. Boemann <cbo@boemann.dk>
Date:   Sat Nov 30 16:43:30 2013 +0100

    Merge branch 'text-annotation' of git://anongit.kde.org/calligra into text-annotation

commit 955818d3
Author: C. Boemann <cbo@boemann.dk>
Date:   Sat Nov 30 16:43:10 2013 +0100

    less qDebug

commit e442fabb
Merge: 0b4be461 d5f3f5dd
Author: C. Boemann <cbo@boemann.dk>
Date:   Sat Nov 30 14:07:55 2013 +0100

    Merge branch 'master' into text-annotation

commit bbecfa55
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Sat Nov 30 00:23:25 2013 +0100

    Don't show annotation shapes before they are laid out.

commit 0b4be461
Author: Inge Wallin <inge@lysator.liu.se>
Date: ...