DiscountType and DiscountSubType server done
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Repository/BaseRepository/Model.Views.cs
	Repository/BaseRepository/Model.edmx
	Repository/BaseRepository/Model.edmx.diagram