Fixed i0S7 problems with encoding strings
Updated project file for XCode5
Merge branch 'iOS7' into master
Updated SDK version to 1.2.1
Merged master into development