Bugs Fixing
Merge branch 'master' of github.com:aloysiusari/Ottimov2.0

Conflicts:
	CodeX.Ottimo.Web.PatientManagement/Program/PatientVisitPage/GenerateBill/GenerateBillEntry.aspx