Merge branch 'release/1.1'
Merge branch 'release/1.2'
file added on submit ion
Merge branch 'master' into develop
updated to Xcode 6.0.1