dashboard change
Merge remote-tracking branch 'origin'

Conflicts:
	Gemfile.lock
	app/controllers/cloud_books_controller.rb
	app/views/dashboards/index.html.erb
test
Merge remote-tracking branch 'origin'
table, cb limit, getting started, upgrade fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js