Merge branch '4.6'
Conflicts:
mobile/calendar/korganizer-mobile.desktop
mobile/contacts/kaddressbook-mobile.desktop
mobile/mail/kmail-mobile.desktop
mobile/mail/kmail-mobile.notifyrc
mobile/notes/notes-mobile.desktop
mobile/tasks/tasks-mobile.desktop