Merge branch 'hector'
dashboard
Merge branch 'master' of https://github.com/EmpireBT/empireBT
some changes
Merge Master