{% load url from future %} is no longer necessary in django 1.5
comply with the new url style of the original contrib.admin
django.utils.simplejson is deprecated
python 2.5 is no longer supported in django 1.5, so the json module
always exists
remove conflicting bootstrap css class
lock background in modal inlines
Merge branch 'master' into django1.5
fixed conflicts
reworked filters
Merge branch 'master' into django1.5
Merge branch 'master' into django1.5
fix filter bug with bootstrap 2.2.2
added js semicolon
Merge branch 'master' into django1.5

Conflicts:
	yawdadmin/static/css/admin.css
minor updates
Merge branch 'master' into django1.5

Conflicts:
	yawdadmin/static/css/admin.css
Merge branch 'master' into django1.5

Conflicts:
	yawdadmin/static/css/admin.css
	yawdadmin/templates/admin/edit_inline/stacked.html
Merge branch 'master' into django1.5
Merge branch 'master' into django1.5
added hidden field handling in base_form