sd
task-1001
Merge branch 'master' of github.com:itdoors/sd

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
Merge remote-tracking branch 'origin/staging'
task-1059
Merge branch 'master' of github.com:itdoors/sd into tasks_denys
task-1059
bug organization
Merge branch 'staging' of github.com:itdoors/sd into staging
task-1065
task-1065
task-1065
Merge branch 'task-1065' into staging
task-1065
task-1065
task-1065