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