bug 611 done
Merge branch 'staging' of github.com:itdoors/sd into staging