Merge pull request #364 from teharrison/develop

API updates: support chnages in shock, add sort for m5nr, fixed issuses with matrix
updated jquery version
added bootstrap css
updated queryAPI function
cleaned up result table
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
Merge pull request #365 from paczian/master

metagenome search update
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop