Merge branch 'hotfix/xcode6' into dev
Merge branch 'release/1.0.1'