Basic support for inline form sets
Merge remote-tracking branch 'origin/master' into inline-formsets
Merge remote-tracking branch 'origin/master' into inline-formsets

Conflicts:
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
Merge remote-tracking branch 'origin/develop' into inline-formsets
Merge remote-tracking branch 'origin/develop' into inline-formsets

Conflicts:
	djadmin2/templates/admin2/bootstrap/model_add_form.html
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
	djadmin2/views.py
Improve the rendering of inline form sets
Fix broken tests
Merge branch 'inline-formsets' of git://github.com/AndrewIngram/django-admin2 into AndrewIngram-inline-formsets
Update django.contrib.admin reference file to provide reference for this pull request
Add django-extra-views to dependencies to provide formset controls for contributors