Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
CMakeLists.txt
akonadi/calendar/incidencechanger.cpp
kabc/CMakeLists.txt
kabc/addressee.cpp
kcal/calhelper.h
kcal/icaltimezones.cpp
kcal/localdir.desktop
kcal/tests/CMakeLists.txt
kcal/tests/testcalendarlocal.cpp
kcal/tests/testrecurprevious.cpp
kcal/tests/testrecurrence.cpp
kcal/tests/testrecurrencetype.cpp
kcal/tests/testrecurson.cpp
kcal/versit/vobject.h
kresources/kresources.desktop
kresources/kresources_manager.desktop
kresources/kresources_plugin.desktop