re correct paths in xml
Merge branch 'develop' of https://github.com/tmarcote/jsconf-phonegap into develop
cosas de xcode
Merge branch 'feature/xcodestuff' into develop