latest progress
Merge branch 'ebi-tests-round2' of https://github.com/teravest/qiita into ebi-tests-round2

Conflicts:
	qiita_db/test/test_metadata_template.py
finished test_add_samples_from_templates