Merge branch 'master' of https://github.com/qiime/qiime_web_app
Merge branch 'master' of https://github.com/qiime/qiime_web_app
Checking in fix so that participants can't do anything unless they verify their kit. Fixes issue #503
Add .gitignore file for results folder

This file will prevent anything contained in the results folder to be
added.
Merge pull request #534 from ElDeveloper/results

Add .gitignore file for results folder
Add links to de-identified results

Adds link on sample_overview.psp and a placeholder when the sample
has not yet been processed.
Merge pull request #535 from adamrp/deidentified_results

Add links to de-identified results
updated FAQ with module 2 result
reorder faq
Update ag_edit_barcode with new sampling sites

the available sampling sites on this page are now the same as those available
to participants, as of the time of this commit.
Merge pull request #538 from adamrp/wwwadmin_sampling_sites

Update ag_edit_barcode with new sampling sites
Update portal to alert users if results are done

Check if the user has any results available on the filesystem. If so, select
the results tab
Update results tab

If the user has results available, indicate this, and provide links to the
sample overview pages for those samples.
Use splitext instead of replace
Add text about what samples might be available

Also fixes some formatting issues
Add participant names to links on results_portal
Merge pull request #539 from adamrp/results_update

Results update
Change dict comprehension incompatibility

The dict comprehension does not work on python 2.6, which is what live
uses; use dict-zip instead
Improve the dict-zip so it's not as stupid
Merge pull request #542 from adamrp/fix_dict_comprehension

Change dict comprehension incompatibility