Changed package name due to issues with play store publishing
Merge remote-tracking branch 'origin/master'