Merge pull request #4 from npinchot/4a380bf26a0ebc43450117df64ff0719b2946541

Bug fix for django 1.4.1 admin - issue with get_form and adding new records
Added the obj argument in the get_form super call

The get_form method was calling its super method (defined in the ModelAdmin) but wasn't passing along the obj parameter, causing unexpected behavior.
Changed jquery url to be protocol agnostic

The "http" was hardcoded which caused problems when used from a secure site.
Merge pull request #6 from facundoolano/master

Added the obj argument in the get_form super call
Merge remote-tracking branch 'upstream/master'

merged master from https://github.com/RobCombs/django-locking