Peta
Merge remote-tracking branch 'origin/master'

Conflicts:
	CardCaptorMagimon/.settings/org.eclipse.ltk.core.refactoring.prefs
	CardCaptorMagimon/res/layout/activity_battle_page.xml
	CardCaptorMagimon/res/values/strings.xml
	CardCaptorMagimon/src/com/tekmob/cardcaptormagimon/BattlePage.java
	CardCaptorMagimon/src/com/tekmob/cardcaptormagimon/Peta.java
	CardCaptorMagimon/src/model/BattleModel.java