timeout set to 10 minutes
Merge branch 'master' of https://github.com/agileharbor/shipStationAccess

Conflicts:
	src/Global/GlobalAssemblyInfo.cs
updated version