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'
Merge branch 'master' of github.com:itdoors/sd into tasks_denys
wyswyg and filter edited
Merge branch 'staging' of github.com:itdoors/sd into tasks_denys