Merge branch 'release/0.5'
Merge branch 'release/0.6'
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/readium/SDKLauncher-iOS into develop
Roll back most of the project.pbxproj changes.
Updates for iOS 7.
Merge branch 'develop' into feature/mo_player2