adding people notice when empty on checkin
resolved conflicts
resolved conflicts
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
fixed edit button on people