Merge pull request #254 from MIT-Mobile/3.6/dev-intrepid-svoigt

3.6/dev intrepid svoigt
Fixed ridiculous Xcode 6 image view in nibs issue where nibs wouldn't open in IB and the build would fail... just look at the diff, it's insane what the actual fix was.