Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag

Conflicts:
	YourSport/YourSport.csproj
EventManager
EventController
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/YourSport.csproj