Merge branch 'master' into AdamBranch

Conflicts:
	TinyTank/src/com/tiny/tank/HUD.java
	TinyTank/src/com/tiny/tank/Main_Gameplay.java
Making weapons tag wider
Fixing weapons tag
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
Merge branch 'AdamBranch'