Merge branch 'master' of https://github.com/ioscreator/ioscreator

Conflicts:

iOS8SwiftCollectionViewControllerTutorial/iOS8SwiftCollectionViewControl
lerTutorial/Base.lproj/Main.storyboard