Merge branch 'release/1.1.0' into develop
update tests and test file
added UUID for Xcode6-Beta
Merge branch 'develop'