Join page added to client
Merge commit 'be1402652df6b451e030496859c1e91b69cf97bf'