updated data access method based on tokens
implemented a fix for data access in templated functions
re-changing to what is in pull 898
Merged HcalDataAccess from repository cowden
bringing back to regular state
provisional removal of data access update
Merged data_access_update_for_HCAL from repository abdoulline
extra data access fix
some changes were accidentally overwritten at merge
another missed access fix
hcal data accesss fix to DataMixing stuff
Merged HcalDataAccess2 from repository cowden
re-updating from official-cmssw/CMSSW_7_0_X
second round of consumes updates for HCAL
Merged refs/pull/923/head from repository cms-sw

Conflicts:
	Calibration/HcalCalibAlgos/src/HOCalibAnalyzer.cc
Merge pull request #936 from ktf/consumes-hcal

Consumes migration -- HCAL