Support teams now in the database
Merge branch 'master' of https://github.com/alphasusu/alphasusu

Conflicts:
	config/routes.rb