changed Makefile to use private  hashstack
Merge remote-tracking branch 'master' into HEAD

Conflicts:
	Makefile
Merge branch 'master' into roams-hashstack

Conflicts:
	Makefile
fixed space/tab issue
Merge branch 'roams-hashstack' of https://github.com/erdc-cm/proteus into roams-hashstack

Conflicts:
	Makefile
Merge remote-tracking branch 'origin/master' into HEAD
Merge remote-tracking branch 'origin/master' into hashstack-roams
fixed  some bugs in interpolated bathy tools
[cygwin-stable] Provide branches for safely tracking stable development
Merge in stable/cygwin changes
fix cygwin branch path
Merge pull request #81 from erdc-cm/ahmadia/fix-stable-cygwin

fix stable cygwin branch path
merge in hashdist cygwin branch fix
Makefile: fix typo
Merge pull request #83 from erdc-cm/ahmadia/fix-stable-cygwin2

Makefile: fix typo
Merge remote-tracking branch 'origin/stable/cygwin' into roams-hashstack
fix cygwin stack [again]
Merge pull request #84 from erdc-cm/ahmadia/cygwin-stack-take-3

fix cygwin stack [again]
more stable fixes
Merge pull request #85 from erdc-cm/ahmadia/roams-merge-stable-cygwin

Merge a few more stable fixes into ROAMS stack