Merge branch 'dev' into improve-coverage
Include South in testproject
Merge branch 'improve-coverage' into coveralls

Conflicts:
	testproject/requirements.txt