From cmssw 6 2 x slhc 2014 01 28 1400

This is a merge with updates upstream (contains ME0 and GE2/1). The GEM-CSC algorithm will be put in a special branch.