implemented matches services
implemented Challenges progress calculation
merged master into network-integration