Merge pull request #79 from gpetruc/CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6

Updates to 7.0.X: electron ids, mc matching, fix multiloop
maria_7Z_v2
Merge pull request #82 from mariadalfonso/maria_7Z_v2

maria_7Z_v2
fix wildcard