further updates tested in branches
Merge branch '620_SLHC_TauID2014' of github.com:jpavel/cmssw into 620_SLHC_TauID2014