Some UI updates.
Merge branch 'master' of https://github.com/Goyatuzo/Project-1.git

Conflicts:
	DatWeapon/bin/classes/com/example/datweapon/R$id.class
	DatWeapon/bin/classes/com/example/datweapon/R$layout.class
	DatWeapon/bin/classes/com/example/datweapon/R$menu.class
	DatWeapon/bin/classes/com/example/datweapon/R$string.class
	DatWeapon/bin/classes/com/example/datweapon/R$style.class
	DatWeapon/gen/com/example/datweapon/R.java
	DatWeapon/res/layout/activity_main.xml