Code Cleanup
Merge branch 'master' of https://github.com/liamhollohan/WellMapper

Conflicts:
	WellMapper/MainWindow.xaml
	WellMapper/MainWindow.xaml.cs
	WellMapper/SiteData.xaml.cs

Trying to merge files.