Before merge
Merge remote-tracking branch 'origin/master'
change Association has_one to has_many
has_many changes
Minor update (comment resque)
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/controllers/cloud_books_controller.rb
merge raj's changes (comment out resque)