Django 1.6 support
Hvad doesn't support django 1.6
Added django 1.6 to travis
Documentation and test apps
Merge branch 'master' into v2

Conflicts:
	.travis.yml
	test_project/test_project/settings.py
	test_project/test_project/urls.py
Moved base and index templates from old test_project to new test_project
Documentation update