task-832
task-832
Merge branch 'staging' of github.com:itdoors/sd into staging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
task-838
Merge branch 'staging' of github.com:itdoors/sd into staging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#845
fix merge!!!!
#849 #843
#fix user contact list
Merge with staging