Badge colors
Update
Merge branch 'master' of github.com:cimav/sigre

Conflicts:
	db/schema.rb