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
checking in changes for time entry on add sample and rounding on height/weight
checking in location dropdown for survey page 3
Merge pull request #196 from meganap/agut

checking in field validation changes
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
checking in js fixes
Merge pull request #197 from meganap/agut

checking in js fixes
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
checking in changes to field names in add_sample
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