Incomplete views/models
Merge
edited template & disease view
Merge branch 'master' of https://github.com/jtapial3113/snvdb

Conflicts:
	snv/models.py