formatting
Merge branch 'master' of github.com:HuygensING/bioport-repository

Conflicts:
	bioport_repository/tests/test_db.py