making sticky
Merge branch 'master' of git://github.com/qiime/qiime_web_app into wwwadmin
adding ability to edit barcodes in wwwadmin
resetting menu.psp
Merge pull request #411 from douginator2000/wwwadmin

Adding ability to edit barcodes in wwwadmin