Increment to push new updates to the google play store entry
Merge pull request #196 from dewguzzler/master

Increment to push new updates to the google play store entry
Resolve merge conflict in manifest