Merge branch 'tool-crud'

Conflicts:
	app/controllers/teams.server.controller.js
	app/tests/team.server.model.test.js
	app/tests/tool.server.model.test.js