[CB] -- Fixed TeamMatcher java class, fixed ScalaRepoTests,
changed imports on controller to compile correctly
Merge branch 'master' of https://github.com/frugs/facewall

Conflicts:
	app/controllers/NewUserController.java