Update note on pad join
Merge branch 'develop' of github.com:zosiakropka/academia into develop

Conflicts:
	server/pad/models.py