Add invite
Add invite
Merge branch 'shao'

Conflicts:
	client/elevator.html