- updated to recommended project settings for Xcode 6
Merge branch 'develop' into feature/xcode_6_modernization
- Removed an unnecessary file for tracking in git
- added a new XCUnit test target to AppTrap
- Replaced a #import with @import
Merge branch 'feature/xcode_6_modernization' into develop