merged with generalized options
Merge branch 'master' of na62farmui1:/git/na62-farm-telsim
Updated Author information
Merge branch 'master' of na62farmui1:/git/na62-farm-telsim
Now using Options from na62-farm-lib
Now using Options from na62-farm-lib
merged master-develop