Merge pull request #556 from MG-RAST/develop

SSL update
Merge pull request #558 from MG-RAST/develop

failed login https fix
add job_id to output
Merge pull request #560 from teharrison/develop

add job_id to output
action to add job to project
Merge pull request #561 from teharrison/develop

action to add job to project
set charset to utf-8
Merge pull request #562 from paczian/develop

set charset to utf-8
fix file_type when suffix is different
Merge pull request #563 from teharrison/develop

fix file_type when suffix is different
fixed cannot change user password bug
Merge pull request #564 from paczian/develop

fixed cannot change user password bug
Need quotes for solr query field even when it is within *<query>*.
Merge branch 'develop' of https://github.com/MG-RAST/MG-RAST into develop
Merge pull request #565 from jaredbischof/develop

Need quotes for solr query field even when it is within *<query>*.
Merge pull request #16 from teharrison/develop

merge from develop
Merge pull request #566 from teharrison/shock

Shock