renamed uri.ws war package
Merge branch 'master' into nov-profile-prototype