Merge pull request #1555 from neilang/master

Minor change to fix issue with number based enums
Changed attr() to prop() since jQuery 1.9 no longer supports attr() for checking checkboxes
Merge pull request #1564 from pepijn/master

jQuery incompatiblity
Added the options inline_add and inline_edit to toggle add/edit buttons on associated field forms