Version forum
Merge branch 'master' of https://github.com/suiko1984/AreaQuest

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/AreaQuest.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/areaquest/mobile/BattleActivity$BattleTask.class
	bin/classes/com/areaquest/mobile/BattleActivity$WaitTask.class
	bin/classes/com/areaquest/mobile/BattleActivity.class
	bin/classes/com/areaquest/mobile/IntroActivity.class
	bin/classes/com/areaquest/mobile/LoadGameActivity$LoadGameLoadingTask.class
	bin/classes/com/areaquest/mobile/LoadGameActivity.class
	bin/classes/com/areaquest/mobile/MenuActivity.class
	bin/classes/com/areaquest/mobile/NewGameActivity$NewGameLoadingTask.class
	bin/classes/com/areaquest/mobile/NewGameActivity.class
	bin/classes/com/areaquest/mobile/R$attr.class
	bin/classes/com/areaquest/mobile/R$color.class
	bin/classes/com/areaquest/mobile/R$dimen.class
	bin/classes/com/areaquest/mobile/R$drawable.class
	bin/classes/com/areaquest/mobile/R$id.class
	bin/classes/com/areaquest/mobile/R$layout.class
	bin/classes/com/areaquest/mobile/R$menu.class
	bin/classes/com/areaquest/mobile/R$string.class
	bin/classes/com/areaquest/mobile/R$style.class
	bin/classes/com/areaquest/mobile/R$styleable.class
	bin/classes/com/areaquest/mobile/R.class
	bin/classes/com/google/android/gms/R$attr.class
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$drawable.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/com/google/android/gms/R$styleable.class
	bin/classes/com/google/android/gms/R.class
	bin/resources.ap_
	gen/com/areaquest/mobile/R.java
	gen/com/google/android/gms/R.java
	project.properties
	src/com/areaquest/mobile/BattleActivity.java