Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update Excavator.exe.config
Merge branch 'develop'
Update Rock.dll
Update Rock.Wpf.dll
Added error handling to troubleshoot Win7
Build release versions
Moved error handling to App.xaml
Rebuild release versions, fix #16
Merge branch 'develop'

Conflicts:
	Excavator/ConnectPage.xaml.cs
	Excavator/bin/Excavator.F1.dll
	Excavator/bin/Excavator.exe
	Excavator/bin/Excavator.exe.config
Rebuild release versions
Merge branch 'master'