erge branch 'master' of https://github.com/biocore/qiita into issue-1912
erge branch 'master' of https://github.com/biocore/qiita into issue-1912

ElDeveloper/qiita,josenavas/QiiTa,antgonza/qiita,biocore/qiita,ElDeveloper/qiita,ElDeveloper/qiita,biocore/qiita,ElDeveloper/qiita,biocore/qiita,antgonza/qiita,josenavas/QiiTa,josenavas/QiiTa,josenavas/QiiTa,antgonza/qiita,antgonza/qiita,biocore/qiita