Made necessary changes to build on Xcode 6.1
Merge branch 'feature/bandedo/xcode-6.1-upgrade' into develop
Merge branch 'develop'