distribute and install xml templates
distribute and install xml templates

Conflicts:
	setup.py
describe how to work with django 1.6
Merge branch 'master' into test
Merge branch 'test' of github.com:shenek/django-mojeid-auth into test