making sticky
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
making sticky
fixing merge
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
adding test barcode images
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge pull request #198 from meganap/agut

checking in changes to field names in add_sample
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
making sticky
fixes for sample time and date
rolling change out of menu
Merge pull request #199 from douginator2000/agut

Agut
checking in templates for overview pages