Split logic out of DefaultController
Merge branch 'master' of github.com:Panoptisis/team-up

Conflicts:
	src/TeamUp/TeamBundle/Resources/config/routing.yml