Merge from head

[selectricity] / app / controllers / selectricity_service_controller.rb

class SelectricityServiceController < ApplicationController
  web_service_dispatching_mode :delegated
  web_service :vote, SelectricityService.new
end