Merge pull request #361 from jaredbischof/develop

Search resource added to API.  Currently contains simple metagenome sear...
fixed quotes in some error messages to comply to JSON standard
updated for new SOLR api
Merge pull request #363 from paczian/master

oauth2 mini patch
API: fixed shock error return message
API: update shock functions and notebook resource due to change in top level node fields
API: added sort support to m5nr
Merge pull request #362 from jaredbischof/develop

Added sort_by and sort_dir to solr query call to sort by a return field ...
matrix api: added option to use hierarchal level with filter list, added more cv checking and error messages, matrix now returns list of all input ids even if no results found for some (throws error on empty matrix)
API: fixed conflicts
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
refactored tool to work with m5nr API and not directly to sql DB. still same functionality
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #366 from teharrison/develop

refactored tool to work with m5nr API and not directly to sql DB. still same functionality
Edited upload page to require project edit rights on the project in their metadata spreadsheet before allowing a user to validate their metadata spreadsheet.