Trying to integrate new login dialog
Merge branch 'master' of github.com:MayOneUS/teams

Conflicts:
	markup/show_team.jade.j2
Merge branch 'master' of github.com:MayOneUS/teams
Putting login back