Merge branch 'release/1.6'
Merge branch 'release/2.0'
updating travis
fix for NPE on return from background
bump version number
Merge branch 'hotfix/2.1' into development