Master changed
Merge branch 'testbranch'

Conflicts:
	gittest/settings.py
Merge branch 'master' into testbranch
changed by testbranch