Merge pull request #554 from goldrush/develop

Develop
Merge pull request #559 from goldrush/develop

Develop
Merge pull request #561 from goldrush/develop

Develop
Merge pull request #563 from goldrush/develop

Develop
Merge pull request #571 from goldrush/develop

Develop
Merge pull request #574 from goldrush/develop

Develop
Merge pull request #577 from goldrush/develop

Develop
Merge pull request #579 from goldrush/develop

Develop
Merge pull request #582 from goldrush/develop

Develop
Merge pull request #584 from goldrush/develop

Develop
Merge pull request #586 from goldrush/develop

Develop
slow query
Merge pull request #587 from goldrush/master

reverse