Merge branch 'NewCharts'
Merge branch 'DeploymentScript'

Conflicts:
	.gitignore
Merge branch 'DeploymentScript'
Merge branch 'NewCharts'
Merge branch 'ReportFiles'

Conflicts:
	app/assets/javascripts/application.js.coffee
	app/helpers/builds_helper.rb
	app/helpers/projects_helper.rb
	app/models/build.rb
	app/models/project.rb
	app/views/builds/show.html.haml
	db/schema.rb
	lib/api/entities.rb
add deployment color