Fixed ApplicationHelper tests.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/spec/helpers/application_helper_spec.rb