Updated to the latest SDK and changed version number to 2.1
Fixed SDK path for release and adhoc builds.
Merge pull request #410 from gavincornwell/master

Integrated latest 1.4 SDK and fixed fallout
Attempt to fix Bamboo build possibly caused by a bug in Xcode 6.1.
Merge pull request #411 from gavincornwell/master

Attempt to fix Bamboo build possibly caused by a bug in Xcode 6.1.