Updated for django-1.7
Merge branch 'master' of github.com:bendavis78/django-formhelper

Conflicts:
	formhelper/templatetags/formhelper.py
	setup.py