task-1059
bug organization
Merge branch 'staging' of github.com:itdoors/sd into staging