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

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/staging'