Address and room number is managed locally
Merge branch 'master' into employee-api