Removing the double-wrapping of object-tools
Modify deprecated template tags for Django 1.5 compatibility
Merge branch 'master' of git://github.com/dfrdmn/django-su into feature/updates

Conflicts:
	src/django_su/templates/su/login_link.html
Merge pull request #1 from fredpalmer/feature/updates

Pull request to artistgrowth/develop from fredpalmer/feature/updates
Merge pull request #2 from artistgrowth/develop

Update master from develop