Local
Merge branch 'master' of https://github.com/ragare62/AriClinic
local
Merge branch 'master' of https://github.com/ragare62/AriClinic

Conflicts:
	AriClinic/AriCliWeb/Properties/PublishProfiles/AriClinic2013.pubxml
Estimate

before grid estimateline