adapt code to Manuel's server (new routes model, exchange put/post,
better responses)
Merge branch 'master' into BranchSabrina
Merge branch 'BranchSabrina'