replacing pusher with slanger
Merge branch 'master' of github.com:anilmaurya/bidder into rails_4

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