In has_many, add a wrapper div around "Add" and "Undo remove" buttons.
Merge branch 'has_many-uniform-remove' into kenzai