Descontos_AvistaModel.cs
Merge branch 'master' of https://github.com/dramosti/Magnificus2014

Conflicts:
	Model/HLP.Entries.Model/HLP.Entries.Model.csproj
Merge branch 'master' of https://github.com/dramosti/Magnificus2014