Merge pull request #1214 from jlipps/master

ios 7 compatibility updates
don't hardcode xcode dir in getBuiltInAppDir (fix #1216)