Make it Xcode 6.1 compatible.
Add files to .gitignore
Merge branch 'develop'

* develop:
  Add files to .gitignore
  Make it Xcode 6.1 compatible.