Merge branch 'master' of heroku.com:dashy3

Conflicts:
	jobs/charts_data.rb
1st try with bootstrap