branches merged and tag

[Marco Martin]

Hi all,

After the testing done to the integration branch done last days, i merged into 
master the following branches:

origin/rcg/imageviewer
origin/pa4/fileBrowser-fileTypeUI
origin/alarmsenginefixes
origin/oliverhenshaw/power-timeouts
origin/webkit23
origin/mbohlender/active.powerbutton
origin/mbohlender/active.welcome
origin/pa4/criticalfixes

all of those branches can be deleted from git, if there aren't any objections 
(will leave there for a bit still)

the only branch i still didn't really feel good enough for pa4 at the current 
state is the orientation one, so that's still only in integration.

Active/4.0 is now tagged, so release can be near.

if there are objections on what it in the tag or what is missing that should 
really go in pa4, please let me know asap ;)

Cheers,
Marco Martin