incremental sheckin
fix problem?
Merge branch 'master' of https://github.com/dtsagile/cdot-cost-planner

Conflicts:
	net/CostPlanner/Content/css/Site.css