Master

Merged methods by beam process and by cycle into one common set accepting either beamprocess="..." or cycle="..." to be applicable in LHC and the injectors. Few minor bug fixes otherwise.