threddsDev waterML example files and catalog;
put on thredds-test
Merge remote-tracking branch 'origin/master'

Conflicts:
	idd/config.zip
	thredds/config.zip
	threddsDev/config.zip
threddsDev waterML example files and catalog;
put on thredds-test