formatting
Merge branch 'master' into dev

Merging the dev code into the new production code for hex v3.
now on play stor!