Merged l1t-devel-CMSSW_7_2_0_pre7 from repository cms-l1t-offline
First addition of 3x3 HoE to the isolated electron conf.
Merge branch 'l1t-devel-CMSSW_7_2_0_pre7' of github.com:cms-l1t-offline/cmssw into from-CMSSW_7_2_0_pre7

Conflicts:
	L1Trigger/L1TCalorimeter/plugins/L1TCaloRCTToUpgradeConverter.cc
Added changes to the CondFormats
Merge pull request #19 from cms-l1t-offline/electronDevMaria

Electron dev maria