Fixed devise links for teams
Merge branch 'beta'