fix cs ipad storyboard crashing
should fix ipad storyboard problems
Merge https://github.com/mbsdev/MBS-Now

# 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.