another branches reshuffling

[Marco Martin]

Hi all,
right now the activitymanager related work is in the active-development/master 
branch.
as the name tells, that's dove on top of master, that is really the easiest 
way to develop, but...

the first release will have to be done on top of 4.7, so this means we need an
active-development/4.7 on top of 4.7, with just all the patches needed for 
activity manager/qml bindings.

Ivan, can you isolate the needed commits? and can it work on top of a 4.7 
branch?

Cheers,
Marco Martin