Causes Disease OK
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/diseases/migrations/0001_initial.py