update libs including Django 1.6.5
Merge branch 'master' of github.com:MadeInHaus/django-template

Conflicts:
	.gitignore