switch to new url tag syntax
Merge branch 'master' into django-1.5

Conflicts:
	pact/templates/pact/patient/pactpatient_careplan.html
	pact/templates/pact/patient/pactpatient_submissions.html
adding load future url for 1.5 compat
adding dangling url not wrapped for 1.5
putting extends on top of template
switch to new url tag syntax
adding load future url for 1.5 compat
adding dangling url not wrapped for 1.5
putting extends on top of template
Merge branch 'django-1.5' of github.com:dimagi/hq-pact into django-1.5

Conflicts:
	pact/templates/pact/patient/pactpatient_submissions.html
cleanup
removing navigation info - merge artifact?
just sayin
cleanup
Merge pull request #45 from dimagi/django-1.5

Django 1.5