Implemented google-sign-in feature, team_admin feature and member approval by team_admin, company has_many teams feature
Implemented Team Reports feature and TB and ETB values differenciation
Merge branch 'master' of https://github.com/elliotte/WazaReport

Conflicts:
	app/controllers/teams_controller.rb
	app/models/team.rb
	app/models/user.rb
	app/views/reports/show.html.erb
	app/views/teams/index.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb
	spec/factories/teams.rb
	spec/models/team_spec.rb
	spec/models/user_spec.rb
before clean out