Fix jenkins status table
Merge branch 'pingdom_status'
Fix settings for assets to make production work
Merge branch 'fix_assets_on_production'
Added betterplace status resque numeric widget
Merge branch 'averell23-master'

Conflicts:
	app/models/sources/number/betterplace_resque.rb
Merge branch 'master' of github.com:betterplace/team_dashboard