fixed args.watertxtfiles to args.waterxmlfiles for xml processing
Merge branch 'develop'