Change weighting of FDK according to new formula described in [Rit and
Clackdoyle, CT meeting, 2014]
Merge branch 'master' into CTmeeting2014
Merge branch 'master' into CTmeeting2014