Merge pull request #553 from MG-RAST/develop

merged updates
Merge pull request #556 from MG-RAST/develop

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

failed login https fix
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>*.
Fix to m5nr query.
Merge pull request #567 from jaredbischof/develop

Fix to m5nr query.
start of KBase auto user generation