Merge branch 'pr/41'

Conflicts:
	lib/x-editable-rails/view_helpers.rb
	test/view_helpers_test.rb