WADL changes

author: diane fleming
Merge pull request #36 from dian4554/wadl-fixes

WADL changes