Merge branch 'production'

author Oskar Wiksten <oskar.wiksten@gmail.com>

Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)

committer Oskar Wiksten <oskar.wiksten@gmail.com>

Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)
author Oskar Wiksten <oskar.wiksten@gmail.com>
Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)
committer Oskar Wiksten <oskar.wiksten@gmail.com>
Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
Simple merge
author	Oskar Wiksten <oskar.wiksten@gmail.com>
	Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)
committer	Oskar Wiksten <oskar.wiksten@gmail.com>
	Fri, 22 Jun 2012 14:54:42 +0000 (16:54 +0200)