change

change
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/templates/main/join.html
	apps/templates/main/login.html