javadoc - states
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject.git into Gameplay