font change
Merge remote-tracking branch 'origin'

Conflicts:
	config/database.yml
Merge remote-tracking branch 'origin'
Node index and delete fixed
Just a Source > Format of code
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/controllers/cloud_books_controller.rb
Keep rspec-rail in dev only as bundler 1.5-rc1 doesn't like it.
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock
check assets precompile
check assets precompile