Merge branch 'hotfix/0.2.15'
Fix issue #1 and #2

issue #1
    RunTimeError when saving via admin
issue #2
    Has this been tested with Django 1.5+
Bump version
Merge branch 'hotfix/0.2.16' into develop