hotfixes for crashes pre-lollipop
Merge branch 'hotfix/2.2'
bump version
Merge branch 'hotfix/2.2.1'