Merge remote-tracking branch 'origin/master'
double graph try
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/templates/dashboards/show.html.erb
cross_cloud profitbricks addedd
Dash needs to show instances in cloud, apps types pie chart, logs busy indic.
Merge remote-tracking branch 'ta/master'
profitbricks cloud fixes
upgrade angularbusy, dash with a pie chart,barchart, jazz up dash.
Merge remote-tracking branch 'ta/master'
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock
	app/controllers/cross_clouds_controller.rb
Fix dashboard index page