bootstrap3: fix js error on add for django > 1.6

Use django 1.7 js instead of the 1.6 one. Should work on 1.6 too.

Fix #155
bootstrap3: Fixup deprecation warning

RemovedInDjango18Warning: Options.module_name has been deprecated
in favor of model_name

Fix #154
Update CHANGELOG
Bump release to 2.1.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	django_admin_bootstrapped/bootstrap3/templates/admin/change_form.html