Solved samples conflict
Added missing samples, plus clean list of samples
Merge branch 'LastControlVariable' of https://github.com/mmasciov/cmg-cmssw into Cleanup124