Merge branch 'master-june15-egalgs' into 'master'

...ion/egamma/egammaAlgs/python/EMGSFCaloExtensionBuilder.py

...amma/egammaAlgs/python/EMGSFCaloExtensionBuilderConfig.py

...on/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py

...uction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py

...egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py

...amma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py

...egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py

...tion/egamma/egammaAlgs/python/egammaTrackSlimmerConfig.py

.../egamma/egammaAlgs/python/egammaTruthAssociationConfig.py

...ction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py

...ruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.h

...struction/egamma/egammaConfig/python/egammaConfigFlags.py

...on/egamma/egammaTools/python/EMConversionBuilderConfig.py

...on/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py

...struction/egamma/egammaTools/python/egammaSwToolConfig.py

.../egamma/egammaTrackTools/python/egammaTrackToolsConfig.py