FedPS marco proxies
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal.git