Fixed conflicts
Merge branch 'master' of
https://github.com/apfejes/epigenetics-software.git

Conflicts:
	Epigenetics/django_server/dbaccess/views.py