Merge branch 'master' of github.com:meganap/qiime_web_app into agut
Merge branch 'master' of https://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of https://github.com/qiime/qiime_web_app into agut
Checking in sample add form verification
Merge pull request #171 from meganap/agut

Checking in form verification for add sample page
Checking in verification page form validation
Merge branch 'master' of https://github.com/qiime/qiime_web_app into agut
Checking in changes for single barcode select
reverting changes....................
Merge pull request #172 from meganap/agut

Checking in verification page form validation
lotsa updates
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Revert verification.psp to all-or-nothing
Checking in text field clearing when it has the default option
Merge branch 'master' of https://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of https://github.com/qiime/qiime_web_app into issue_168

Conflicts:
	www/americangut/verification.psp
lotsa updates
Merge pull request #174 from douginator2000/agut

changes for menu management/sample management
checking in fix to js
Merge pull request #173 from meganap/agut

Checking in text field clearing when it has the default option