working copy
merged addhoc
publishing after changes on 30012014