Fixed tokenfactory
Merge branch 'Gameplay' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Gameplay