adding test for extra form fields being added
removed left in merge lines
test fixes
Merge branch 'develop' into feature/django-16