merge everything back from mainline branch

[selectricity-live] / app / helpers / application_helper.rb

# Methods added to this helper will be available to all templates in the application.
module ApplicationHelper
end