Refactoring and javadoc
Merge branch 'Gameplay' of github.com:Daveiac/AndroidGameProject into Gameplay