Develop to master

Mahdi Yarirequested to merge
develop into master

dbuzz and hivewallet removed

Merge request reports