update pub date for devguide; update wadl to fix autogenerated text
fix merge conflict