Merge branch 'hotfix/v2.0.1'
Merge branch 'release/v2.1'
updated to api 17 and eclipse platform on Apple
fixed conflicts