Merge branch 'elevation2' of https://github.com/adamrp/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'fix_study_summary' of https://github.com/adamrp/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'fixconsentformat' of https://github.com/teravest/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app