Fixed buttons.
Merge branch 'origin/master'

Conflicts:
	res/drawable-hdpi/btn_focused_test.png
	res/drawable-hdpi/btn_pressed_test.png
	res/layout/menu.xml
	src/com/RoboMobo/Map.java
Merge branch 'origin/BT'