Changes on Affiliate/Volag
Merge branch 'master' of https://github.com/technomile/dotnet-ecdc30.git