Update the storyboard branch with last update on master branch

I've upgraded all sources of branch 'Storyboard' with changes on 'master', including the new iOS7 changes.