back to last update
Merge remote-tracking branch 'origin'
back to upd
api workers using resque. They call megam_play via background job.
Brocken signup via fb yet to be tested
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile.lock
tmp file Gemfile.lock changed