annotation update and detail export
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/primers_1.csv
	contig_retrieval_tool/primers_2.csv
	contig_retrieval_tool/temp/tmp/BF4a/Forward.txt
	contig_retrieval_tool/temp/tmp/BF4a/Reverse.txt
	contig_retrieval_tool/temp/tmp/BT2/Forward.txt
	contig_retrieval_tool/temp/tmp/BT2/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-10/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-10/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-123/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-123/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-15/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-15/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-18/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-2/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-2/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-64/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-92/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-92/Reverse.txt
	contig_retrieval_tool/temp/tmp/lac161/Forward.txt
	contig_retrieval_tool/temp/tmp/lac161/Reverse.txt
	contig_retrieval_tool/temp/tmp/lac36W/Forward.txt
	contig_retrieval_tool/temp/tmp/lac36W/Reverse.txt
	mainsite/views.pyc