Fix package name
Fix package name
Fix getLocation test
Fix travis status image
Merge branch 'public' into develop
Fix travis status image