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)
successfully completed cloud_books_history model creation
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/controllers/cloud_books_controller.rb
	app/views/cloud_books/create.js.erb
A minor fix to cloud_books_controller
Fix for the view not being responsive (aligning itself based on width)
Merge remote-tracking branch 'ta/master'
++*optional, my image has rounded circle now/sans size.(we support 140 x 140)
cloud-shield image 2d added
Merge remote-tracking branch 'origin'
Add socket.io connection
Nuke the conventional routes which appear named in the routes.rb.
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock
	app/controllers/cloud_books_histories_controller.rb
	config/routes.rb
fix to invoke megam_api
worker actions created with the actual action name.