Merge branch 'master' of https://github.com/jtestard/iPhoneComposer