Ruby 2.0.0-p0
Remove dashboard and lazy_high_charts
Gem updates
Merge branch 'master' into bpa

Conflicts:
	Gemfile.lock