fix for NPE on return from background
bump version number
Merge branch 'hotfix/2.1'