WIP
Merge branch 'master' of github.com:mamlukishay/inline

Conflicts:
	Gemfile
	app/roles/customer.rb
	spec/interactions/queues/add_user_to_queue_context_spec.rb
	spec/roles/customer_spec.rb