added team color to env collection
change badge color to black
Merge branch 'master' of github.com:rbsdev/pusher

Conflicts:
	app/scripts/list.js