expand mergetasks and addhours scripts to account to risk assessment

[http://dummy.us.eu.org/robert (Robert)]

Expand mergetasks to keep lines which have '[0-9]*%' at the end of the
   line, regardless of whether it's in the oldtasks list
Expand addhours to look for '[0-9]*%' at the end of lines and consider
    them to be expected probabilities
   and then count and roll-up underlying hours