fixes #270: correct XIB setup with autolayout
Merge branch 'develop' into 270-autolayout-storyboards