Add ET and HT GCT converters
Merge branch 'l1t-devel-CMSSW_7_1_0_pre2' of github.com:cms-l1t-offline/cmssw into mydevel-branch

Conflicts:
	L1Trigger/L1TCalorimeter/plugins/PhysicalEtAdder.cc