edit.html.erb translated to jQuery
Merge conflicts
Merge pull request #1512 from arkon94/edit-r2

edit.html.erb translated to jQuery