added farm2 mac
Merge branch 'master' of na62farmui1:/git/na62-farm-telsim into develop
Now using Options from na62-farm-lib
Now using Options from na62-farm-lib
merged master-develop