Update app/helpers/application_helper.rb
Merge branch 'development'